diff options
author | marha <marha@users.sourceforge.net> | 2012-10-17 08:07:33 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-17 08:07:33 +0200 |
commit | 856fbbaf1e53303d8307bfae1761f1ba96871f1e (patch) | |
tree | e029665439ddbccfb253271a5f5290d72c2b2168 /mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml | |
parent | f15a40afaf6d1b3a4841d25631f947da1b289f89 (diff) | |
parent | ded57b5a4131a213d57f5a20d50b819b7a8924df (diff) | |
download | vcxsrv-856fbbaf1e53303d8307bfae1761f1ba96871f1e.tar.gz vcxsrv-856fbbaf1e53303d8307bfae1761f1ba96871f1e.tar.bz2 vcxsrv-856fbbaf1e53303d8307bfae1761f1ba96871f1e.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman mesa git update 17 oct 2012
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml index 80541a821..11aacb033 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml @@ -39,14 +39,14 @@ <enum name="UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER" value="0x8A46" /> <enum name="INVALID_INDEX" value="0xFFFFFFFF" /> -<function name="GetUniformIndices" offset="assign"> +<function name="GetUniformIndices" offset="assign" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformCount" type="GLsizei" /> <param name="uniformNames" type="const GLchar * const *" /> <param name="uniformIndices" type="GLuint *" /> </function> -<function name="GetActiveUniformsiv" offset="assign"> +<function name="GetActiveUniformsiv" offset="assign" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformCount" type="GLsizei" /> <param name="uniformIndices" type="const GLuint *" /> @@ -62,20 +62,20 @@ <param name="uniformName" type="GLchar *" /> </function> -<function name="GetUniformBlockIndex" offset="assign"> +<function name="GetUniformBlockIndex" offset="assign" es2="3.0"> <return type="GLuint"/> <param name="program" type="GLuint" /> <param name="uniformBlockName" type="const GLchar *" /> </function> -<function name="GetActiveUniformBlockiv" offset="assign"> +<function name="GetActiveUniformBlockiv" offset="assign" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformBlockIndex" type="GLuint" /> <param name="pname" type="GLenum" /> <param name="params" type="GLint *" /> </function> -<function name="GetActiveUniformBlockName" offset="assign"> +<function name="GetActiveUniformBlockName" offset="assign" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformBlockIndex" type="GLuint" /> <param name="bufSize" type="GLsizei" /> @@ -86,7 +86,7 @@ <!-- Duplicated with GL3x.xml: BindBufferRange, BindBufferBase, GetIntegeri_v --> -<function name="UniformBlockBinding" offset="assign" > +<function name="UniformBlockBinding" offset="assign" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformBlockIndex" type="GLuint" /> <param name="uniformBlockBinding" type="GLuint" /> |