diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 00:44:58 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 00:44:58 +0000 |
| commit | 3f00df9a392791d70409df5b217642a1990f52b6 (patch) | |
| tree | 753d407c73e9d651094f88d632d901d22a3b77d0 /third_party/khronos | |
| parent | ce8b05730722ba50d9cb6877adef9f53258dd9ca (diff) | |
| download | chromium_src-3f00df9a392791d70409df5b217642a1990f52b6.zip chromium_src-3f00df9a392791d70409df5b217642a1990f52b6.tar.gz chromium_src-3f00df9a392791d70409df5b217642a1990f52b6.tar.bz2 | |
Add support for GL_CHROMIUM_consistent_uniform_locations
BUG=132844
TEST=unit tests
Review URL: https://chromiumcodereview.appspot.com/10568003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/khronos')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 20 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index 3b162b8..b0a6d8f 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -2002,6 +2002,26 @@ typedef void (GL_APIENTRYP PFNGLCONSUMETEXTURECHROMIUM) (GLenum target, const G #endif #endif +/* GL_CHROMIUM_consistent_uniform_locations */ +#ifndef GL_CHROMIUM_consistent_uniform_locations +#define GL_CHROMIUM_consistent_uniform_locations 1 + +struct GLUniformDefinitionCHROMIUM { + GLenum type; + GLsizei size; + const GLchar* name; +}; + +#ifdef GL_GLEXT_PROTOTYPES +#define glGetUniformLocationsCHROMIUM GLES2_GET_FUN(GetUniformLocationsCHROMIUM) +#if !defined(GLES2_USE_CPP_BINDINGS) +GL_APICALL void GL_APIENTRY glGetUniformLocationsCHROMIUM (const GLUniformDefinitionCHROMIUM* uniforms, GLsizei count, GLsizei max_locations, GLint* locations); +#endif +#else +typedef void (GL_APIENTRYP PFNGLGETUNIFORMLOCATIONSCHROMIUM) (const GLUniformDefinitionCHROMIUM* uniforms, GLsizei count, GLsizei max_locations, GLint* locations); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 5a67f08..1910b57 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -22,5 +22,6 @@ GLES2/gl2ext.h - Added GL_EXT_framebuffer_multisample - Added GL_CHROMIUM_command_buffer_query - Added GL_CHROMIUM_copy_texture + - Added GL_CHROMIUM_consistent_uniform_locations EGL/eglplatform.h - Added EGLNative*Type for Mac. |