diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-22 01:27:50 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-22 01:27:50 +0000 |
| commit | fd135624185ad7fb7972bd11940829c2a975407c (patch) | |
| tree | 1a4b29cf70f829bdba191422815f0ed78c89a262 /third_party/khronos | |
| parent | be93e2cb083233b3ea0fa8ac209463c6996a3ab3 (diff) | |
| download | chromium_src-fd135624185ad7fb7972bd11940829c2a975407c.zip chromium_src-fd135624185ad7fb7972bd11940829c2a975407c.tar.gz chromium_src-fd135624185ad7fb7972bd11940829c2a975407c.tar.bz2 | |
Fix a double define in gl2ext.h
We GL_EXT_framebuffer_multisample to gl2ext.h parts of which
conflict with GL_EXT_multisampled_render_to_texture
The conflict only shows up when compiling for the OpenGL ES 2.0
conformance tests
TEST=compiled the OpenGL ES 2.0 conformance tests
BUG=none
R=apatrick@chromium.org
Review URL: http://codereview.chromium.org/9372082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/khronos')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 2 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index 547518c..fd39ca3 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -1693,6 +1693,7 @@ typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask); #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE #endif +#if 0 // Defined in GL_EXT_multisampled_render_to_texture #ifdef GL_GLEXT_PROTOTYPES #define glRenderbufferStorageMultisampleEXT GLES2_GET_FUN(RenderbufferStorageMultisampleEXT) #if !defined(GLES2_USE_CPP_BINDINGS) @@ -1701,6 +1702,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, #endif /* GL_GLEXT_PROTOTYPES */ typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); #endif +#endif #ifndef GL_EXT_framebuffer_blit #define GL_EXT_framebuffer_blit 1 diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 6d30fdb..aa2accc 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -19,5 +19,6 @@ GLES2/gl2.h GLES2/gl2ext.h - Added Chromium and Angle extensions. - Added ANGLE_instanced_arrays + - Added GL_EXT_framebuffer_multisample EGL/eglplatform.h - Added EGLNative*Type for Mac. |