From 458ee912871b76ad351e946d4d84c70ebe7a429b Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 22 Feb 2018 12:13:39 +0100 Subject: Fix mixing chromium gles2 types with qt defined ones 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 --- chromium/cc/resources/resource_provider.h | 1 + .../browser/compositor/software_browser_compositor_output_surface.cc | 1 + chromium/gpu/command_buffer/common/mailbox_holder.h | 3 +-- 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 #include -#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 -- cgit v1.2.1