diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-11-05 18:55:49 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-05 17:04:01 +0100 |
| commit | 5cb352ffd7c013a1d8ea24107df0c7f1d13fa245 (patch) | |
| tree | 8e0ea476a436ea98941dc984a7c37839aa50861e /chromium/cc | |
| parent | 6d6217cd83b8732eb32a7721c068d8f40048c848 (diff) | |
| download | qtwebengine-chromium-5cb352ffd7c013a1d8ea24107df0c7f1d13fa245.tar.gz | |
Solve conflicts when including both QtOpenGL headers and resource_provider.h
If resource_provider.h is going to be used to integrate delegated frame
to external compositors, it should avoid conflicting with the system's
gl.h.
Change-Id: Ie37d6cde263157e6717cc006a0896f0b9ebdaa5d
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc')
| -rw-r--r-- | chromium/cc/layers/texture_layer.cc | 2 | ||||
| -rw-r--r-- | chromium/cc/raster/staging_buffer_pool.cc | 2 | ||||
| -rw-r--r-- | chromium/cc/resources/resource_provider.h | 5 | ||||
| -rw-r--r-- | chromium/cc/resources/scoped_resource.cc | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/chromium/cc/layers/texture_layer.cc b/chromium/cc/layers/texture_layer.cc index 403b781e49a..5e24d2c78e7 100644 --- a/chromium/cc/layers/texture_layer.cc +++ b/chromium/cc/layers/texture_layer.cc @@ -15,6 +15,8 @@ #include "cc/layers/texture_layer_impl.h" #include "cc/trees/layer_tree_host.h" #include "components/viz/common/resources/single_release_callback.h" +#include "third_party/khronos/GLES2/gl2.h" +#include "third_party/khronos/GLES2/gl2ext.h" namespace cc { diff --git a/chromium/cc/raster/staging_buffer_pool.cc b/chromium/cc/raster/staging_buffer_pool.cc index 81b0e7e5be6..40f70ecf779 100644 --- a/chromium/cc/raster/staging_buffer_pool.cc +++ b/chromium/cc/raster/staging_buffer_pool.cc @@ -14,6 +14,8 @@ #include "cc/base/container_util.h" #include "cc/resources/scoped_resource.h" #include "gpu/command_buffer/client/gles2_interface.h" +#include "third_party/khronos/GLES2/gl2.h" +#include "third_party/khronos/GLES2/gl2ext.h" using base::trace_event::MemoryAllocatorDump; using base::trace_event::MemoryAllocatorDumpGuid; diff --git a/chromium/cc/resources/resource_provider.h b/chromium/cc/resources/resource_provider.h index 7a0927b8f0a..a6de34d549d 100644 --- a/chromium/cc/resources/resource_provider.h +++ b/chromium/cc/resources/resource_provider.h @@ -35,8 +35,6 @@ #include "components/viz/common/resources/resource_settings.h" #include "components/viz/common/resources/single_release_callback.h" #include "components/viz/common/resources/transferable_resource.h" -#include "third_party/khronos/GLES2/gl2.h" -#include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkSurface.h" #include "ui/gfx/buffer_types.h" @@ -50,6 +48,9 @@ namespace gles { class GLES2Interface; } } +// A correct fix would be not to use GL types in this interal API file. +typedef unsigned int GLenum; +typedef int GLint; namespace viz { class SharedBitmap; diff --git a/chromium/cc/resources/scoped_resource.cc b/chromium/cc/resources/scoped_resource.cc index e63e9c26dc4..319304d6579 100644 --- a/chromium/cc/resources/scoped_resource.cc +++ b/chromium/cc/resources/scoped_resource.cc @@ -4,6 +4,8 @@ #include "cc/resources/scoped_resource.h" +#include "third_party/khronos/GLES2/gl2.h" + namespace cc { ScopedResource::ScopedResource(ResourceProvider* resource_provider) |