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 /gpu/GLES2 | |
| 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 'gpu/GLES2')
| -rw-r--r-- | gpu/GLES2/extensions/CHROMIUM/CHROMIUM_consistent_uniform_locations.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_consistent_uniform_locations.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_consistent_uniform_locations.txt index 8a7d163..e7e8907 100644 --- a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_consistent_uniform_locations.txt +++ b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_consistent_uniform_locations.txt @@ -19,14 +19,13 @@ Overview This extension guarantees uniforms always have the same locations. This allows the client program to know the locations of uniforms - without having to compile the shaders, link the program and query - the locations and therefore have no blocking calls when initializing - programs. + without having to wait for shaders to compile or GLSL programs to + link to query the locations and therefore have no blocking calls + when initializing programs. To be forward compatible the locations are provided through the - function GetUniformLocationsCHROMIUM but they can be provided - even before linking a program and therefore do not have to wait - for compile or link completion to return results. + function GetUniformLocationsCHROMIUM. LinkProgram must be called + before calling GetUniformLocationsCHROMIUM. Issues @@ -40,7 +39,8 @@ New Tokens New Procedures and Functions - void GetUniformLocationsCHROMIUM (const GLUniformDefinitionCHROMIUM* uniforms, + void GetUniformLocationsCHROMIUM (GLuint program, + const GLUniformDefinitionCHROMIUM* uniforms, GLsizei count, GLsizei max_locations, GLint* locations); @@ -84,3 +84,5 @@ New State Revision History 7/17/2012 Documented the extension + 7/19/2012 Added <program> argument. + |