diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-30 15:43:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-10 16:18:59 +0200 |
| commit | 6a474313786f73ee7a19ec663b227d67bb071838 (patch) | |
| tree | ce0ac794c4b1567916e31ecdb9a143449c8469bb | |
| parent | 3cbdc74033f6ca1ec28664e0f1a9a0980f049e31 (diff) | |
| download | qtwebengine-chromium-6a474313786f73ee7a19ec663b227d67bb071838.tar.gz | |
<chromium> Only forward declare GL types if they are not defined yet
Protect forward typedefs in gles2_cmd_format.h with GL_VERSION_1_5,
this way if we make sure that this header gets included after
gl_bindings.h we can prevent conflicting declarations of GL types
in the core layer of QtWebEngine.
Change-Id: I2fd8b14e6a5367ceea98068b41e2dd395a1998c8
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| -rw-r--r-- | chromium/gpu/command_buffer/common/gles2_cmd_format.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/gpu/command_buffer/common/gles2_cmd_format.h b/chromium/gpu/command_buffer/common/gles2_cmd_format.h index 20513f5138f..6f30411e1ee 100644 --- a/chromium/gpu/command_buffer/common/gles2_cmd_format.h +++ b/chromium/gpu/command_buffer/common/gles2_cmd_format.h @@ -23,6 +23,7 @@ #include "gpu/command_buffer/common/gles2_cmd_ids.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" +#ifndef GL_VERSION_1_5 // GL types are forward declared to avoid including the GL headers. The problem // is determining which GL headers to include from code that is common to the // client and service sides (GLES2 or one of several GL implementations). @@ -50,6 +51,7 @@ typedef signed long long int GLsizeiptr; typedef khronos_intptr_t GLintptr; typedef khronos_ssize_t GLsizeiptr; #endif +#endif typedef struct __GLsync *GLsync; typedef int64_t GLint64; typedef uint64_t GLuint64; |