diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-02-22 12:13:39 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-03-08 15:23:09 +0000 |
| commit | 458ee912871b76ad351e946d4d84c70ebe7a429b (patch) | |
| tree | f06aa492f95500541c90a156b15350eb3532d149 | |
| parent | c4241cdfc41716fe7b1ab82c39403c17a21873e6 (diff) | |
| download | qtwebengine-chromium-458ee912871b76ad351e946d4d84c70ebe7a429b.tar.gz | |
Fix mixing chromium gles2 types with qt defined onesv5.11.0-beta2
Avoid including chromium gles2 headers. This triggers
confiflic declaration between khronos_ssize_t which is
64bit and ptrdiff_t which is 32bits on 32bit platforms.
Task-number: QTBUG-66597
Change-Id: Icade95463365e05803f7f84889d0d3618ad48d65
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
3 files changed, 3 insertions, 2 deletions
diff --git a/chromium/cc/resources/resource_provider.h b/chromium/cc/resources/resource_provider.h index a6de34d549d..98fe3233548 100644 --- a/chromium/cc/resources/resource_provider.h +++ b/chromium/cc/resources/resource_provider.h @@ -51,6 +51,7 @@ class GLES2Interface; // A correct fix would be not to use GL types in this interal API file. typedef unsigned int GLenum; typedef int GLint; +typedef unsigned int GLuint; namespace viz { class SharedBitmap; diff --git a/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc b/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc index 92d65615c77..22907392d3f 100644 --- a/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc +++ b/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc @@ -16,6 +16,7 @@ #include "components/viz/service/display/output_surface_frame.h" #include "components/viz/service/display/software_output_device.h" #include "content/browser/renderer_host/render_widget_host_impl.h" +#include "gpu/command_buffer/common/gl2_types.h" #include "ui/gfx/vsync_provider.h" #include "ui/latency/latency_info.h" diff --git a/chromium/gpu/command_buffer/common/mailbox_holder.h b/chromium/gpu/command_buffer/common/mailbox_holder.h index bc0d88d65d3..b1cc3dfad42 100644 --- a/chromium/gpu/command_buffer/common/mailbox_holder.h +++ b/chromium/gpu/command_buffer/common/mailbox_holder.h @@ -8,7 +8,6 @@ #include <stdint.h> #include <string.h> -#include "gpu/command_buffer/common/gl2_types.h" #include "gpu/command_buffer/common/mailbox.h" #include "gpu/command_buffer/common/sync_token.h" #include "gpu/gpu_export.h" @@ -30,7 +29,7 @@ struct GPU_EXPORT MailboxHolder { gpu::Mailbox mailbox; gpu::SyncToken sync_token; - GLenum texture_target; + uint32_t texture_target; }; } // namespace gpu |