summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mapi/glapi/gen/EXT_direct_state_access.xml5
-rw-r--r--src/mesa/main/tests/dispatch_sanity.cpp27
2 files changed, 7 insertions, 25 deletions
diff --git a/src/mapi/glapi/gen/EXT_direct_state_access.xml b/src/mapi/glapi/gen/EXT_direct_state_access.xml
index b7074c34841..c35eacadeed 100644
--- a/src/mapi/glapi/gen/EXT_direct_state_access.xml
+++ b/src/mapi/glapi/gen/EXT_direct_state_access.xml
@@ -903,6 +903,11 @@
<param name="length" type="GLsizeiptr" />
</function>
+ <!-- OpenGL 2.0 -->
+ <!--
+ ProgramUniform* functions are already declared in EXT_separate_shader_objects.xml
+ -->
+
<!-- OpenGL 3.0 -->
<function name="MapNamedBufferRangeEXT">
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index fa1ba641452..8e06a7179dd 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -1133,32 +1133,9 @@ const struct function common_desktop_functions_possible[] = {
{ "glGetNamedBufferPointervEXT", 15, -1 },
{ "glGetNamedBufferSubDataEXT", 15, -1 },
/* GL_EXT_direct_state_access - GL 2.0 */
- // { "glProgramUniform1iEXT", 20, -1 },
- //{ "glProgramUniform1ivEXT", 20, -1 },
- //{ "glProgramUniform1fEXT", 20, -1 },
- //{ "glProgramUniform1fvEXT", 20, -1 },
- //{ "glProgramUniform2iEXT", 20, -1 },
- //{ "glProgramUniform2ivEXT", 20, -1 },
- //{ "glProgramUniform2fEXT", 20, -1 },
- //{ "glProgramUniform2fvEXT", 20, -1 },
- //{ "glProgramUniform3iEXT", 20, -1 },
- //{ "glProgramUniform3ivEXT", 20, -1 },
- //{ "glProgramUniform3fEXT", 20, -1 },
- //{ "glProgramUniform3fvEXT", 20, -1 },
- //{ "glProgramUniform4iEXT", 20, -1 },
- //{ "glProgramUniform4ivEXT", 20, -1 },
- //{ "glProgramUniform4fEXT", 20, -1 },
- //{ "glProgramUniform4fvEXT", 20, -1 },
- //{ "glProgramUniformMatrix2fvEXT", 20, -1 },
- //{ "glProgramUniformMatrix3fvEXT", 20, -1 },
- //{ "glProgramUniformMatrix4fvEXT", 20, -1 },
+ /* Added glProgramUniform*EXT functions are aliases */
/* GL_EXT_direct_state_access - GL 2.1 */
- //{ "glProgramUniformMatrix2x3fvEXT", 21, -1 },
- //{ "glProgramUniformMatrix3x2fvEXT", 21, -1 },
- //{ "glProgramUniformMatrix2x4fvEXT", 21, -1 },
- //{ "glProgramUniformMatrix4x2fvEXT", 21, -1 },
- //{ "glProgramUniformMatrix3x4fvEXT", 21, -1 },
- //{ "glProgramUniformMatrix4x3fvEXT", 21, -1 },
+ /* Added glProgramUniformMAtrix*EXT functions are aliases */
/* GL_EXT_direct_state_access - EXT_texture_buffer_object */
//{ "glTextureBufferEXT", 10, -1 },
//{ "glMultiTexBufferEXT", 10, -1 },