diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 02:28:37 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 02:28:37 +0000 |
| commit | 991564bfce0788aa03625b0783147a56ae611ae8 (patch) | |
| tree | 3e60b4e9a058129efda3d16c07d3160a3ef54c10 /third_party/khronos | |
| parent | ad5d305c448bf079c32270005f6fef095f8b05b4 (diff) | |
| download | chromium_src-991564bfce0788aa03625b0783147a56ae611ae8.zip chromium_src-991564bfce0788aa03625b0783147a56ae611ae8.tar.gz chromium_src-991564bfce0788aa03625b0783147a56ae611ae8.tar.bz2 | |
Make GL_CHROMIUM_consistent_uniform_locations slighty more robust
Added a program argument so that at least in debug we can
verify locations are correct. It also means we could fallback
to actually calling GetUniformLocation if need be.
TEST=unit tests
BUG=132844
Review URL: https://chromiumcodereview.appspot.com/10581029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/khronos')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 4 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index e6a728c..0c22849 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -2018,10 +2018,10 @@ struct GLUniformDefinitionCHROMIUM { #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); +GL_APICALL void GL_APIENTRY glGetUniformLocationsCHROMIUM (GLuint program, 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); +typedef void (GL_APIENTRYP PFNGLGETUNIFORMLOCATIONSCHROMIUM) (GLuint program, const GLUniformDefinitionCHROMIUM* uniforms, GLsizei count, GLsizei max_locations, GLint* locations); #endif #endif diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 1910b57..25489ef 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -23,5 +23,6 @@ GLES2/gl2ext.h - Added GL_CHROMIUM_command_buffer_query - Added GL_CHROMIUM_copy_texture - Added GL_CHROMIUM_consistent_uniform_locations + - Update GL_CHROMIUM_consistent_uniform_locations to have a program argument. EGL/eglplatform.h - Added EGLNative*Type for Mac. |