diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 00:28:33 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 00:28:33 +0000 |
| commit | 2be6abf3a4fb590a1b59586858d1e49ea61f0708 (patch) | |
| tree | b20ee87dd632d5a21b40948cd5b430239fcdde0e /third_party | |
| parent | 2c3eaaf90eb2cb35c60272307540b2c2ea335f82 (diff) | |
| download | chromium_src-2be6abf3a4fb590a1b59586858d1e49ea61f0708.zip chromium_src-2be6abf3a4fb590a1b59586858d1e49ea61f0708.tar.gz chromium_src-2be6abf3a4fb590a1b59586858d1e49ea61f0708.tar.bz2 | |
Add glBindUniformLocationCHROMIUM
TEST=unit tests
BUG=132844
Review URL: https://chromiumcodereview.appspot.com/10635011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 18 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 3 |
2 files changed, 7 insertions, 14 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index 0c22849..c604c12 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -2005,23 +2005,17 @@ 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; -}; +/* GL_CHROMIUM_bind_uniform_location */ +#ifndef GL_CHROMIUM_bind_uniform_location +#define GL_CHROMIUM_bind_uniform_location 1 #ifdef GL_GLEXT_PROTOTYPES -#define glGetUniformLocationsCHROMIUM GLES2_GET_FUN(GetUniformLocationsCHROMIUM) +#define glBindUniformLocationCHROMIUM GLES2_GET_FUN(BindUniformLocationCHROMIUM) #if !defined(GLES2_USE_CPP_BINDINGS) -GL_APICALL void GL_APIENTRY glGetUniformLocationsCHROMIUM (GLuint program, const GLUniformDefinitionCHROMIUM* uniforms, GLsizei count, GLsizei max_locations, GLint* locations); +GL_APICALL void GL_APIENTRY glBindUniformLocationCHROMIUM (GLuint program, GLint location, const GLchar* name); #endif #else -typedef void (GL_APIENTRYP PFNGLGETUNIFORMLOCATIONSCHROMIUM) (GLuint program, const GLUniformDefinitionCHROMIUM* uniforms, GLsizei count, GLsizei max_locations, GLint* locations); +typedef void (GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUM) (GLuint program, GLint location, const GLchar* name); #endif #endif diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 25489ef..1fa97c6 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -22,7 +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 - - Update GL_CHROMIUM_consistent_uniform_locations to have a program argument. + - Added GL_CHROMIUM_bind_uniform_location EGL/eglplatform.h - Added EGLNative*Type for Mac. |