[Mesa-dev] [PATCH 02/10] mesa: Allow glGet* queries of select ARB_ubo data in ES 3

[Matt Turner]

Fixes 5 uniform_buffer_object tests in es3conform
---
 src/mesa/main/get.c              |    6 ++++++
 src/mesa/main/get_hash_params.py |   28 +++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index a020643..695d146 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -289,6 +289,12 @@ static const int extra_texture_buffer_object[] = {
    EXTRA_END
 };
 
+static const int extra_ARB_uniform_buffer_object_api_es3[] = {
+   EXT(ARB_uniform_buffer_object),
+   EXTRA_API_ES3,
+   EXTRA_END
+};
+
 static const int extra_ARB_uniform_buffer_object_and_geometry_shader[] = {
    EXT(ARB_uniform_buffer_object),
    EXT(ARB_geometry_shader4),
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index ac9c79c..d6ad91c 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -670,19 +670,6 @@ descriptor=[
   [ "MAX_DEBUG_MESSAGE_LENGTH_ARB", "CONST(MAX_DEBUG_MESSAGE_LENGTH), 
NO_EXTRA" ],
   [ "MAX_DUAL_SOURCE_DRAW_BUFFERS", 
"CONTEXT_INT(Const.MaxDualSourceDrawBuffers), extra_ARB_blend_func_extended" ],
 
-# GL_ARB_uniform_buffer_object
-  [ "MAX_VERTEX_UNIFORM_BLOCKS", 
"CONTEXT_INT(Const.VertexProgram.MaxUniformBlocks), 
extra_ARB_uniform_buffer_object" ],
-  [ "MAX_FRAGMENT_UNIFORM_BLOCKS", 
"CONTEXT_INT(Const.FragmentProgram.MaxUniformBlocks), 
extra_ARB_uniform_buffer_object" ],
-  [ "MAX_GEOMETRY_UNIFORM_BLOCKS", 
"CONTEXT_INT(Const.GeometryProgram.MaxUniformBlocks), 
extra_ARB_uniform_buffer_object_and_geometry_shader" ],
-  [ "MAX_COMBINED_UNIFORM_BLOCKS", 
"CONTEXT_INT(Const.MaxCombinedUniformBlocks), extra_ARB_uniform_buffer_object" 
],
-  [ "MAX_UNIFORM_BLOCK_SIZE", "CONTEXT_INT(Const.MaxUniformBlockSize), 
extra_ARB_uniform_buffer_object" ],
-  [ "MAX_UNIFORM_BUFFER_BINDINGS", 
"CONTEXT_INT(Const.MaxUniformBufferBindings), extra_ARB_uniform_buffer_object" 
],
-  [ "MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS", 
"CONTEXT_INT(Const.VertexProgram.MaxCombinedUniformComponents), 
extra_ARB_uniform_buffer_object" ],
-  [ "MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS", 
"CONTEXT_INT(Const.FragmentProgram.MaxCombinedUniformComponents), 
extra_ARB_uniform_buffer_object" ],
-  [ "MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS", 
"CONTEXT_INT(Const.GeometryProgram.MaxCombinedUniformComponents), 
extra_ARB_uniform_buffer_object_and_geometry_shader" ],
-  [ "UNIFORM_BUFFER_OFFSET_ALIGNMENT", 
"CONTEXT_INT(Const.UniformBufferOffsetAlignment), 
extra_ARB_uniform_buffer_object" ],
-  [ "UNIFORM_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0, 
extra_ARB_uniform_buffer_object" ],
-
 # GL_ARB_timer_query
   [ "TIMESTAMP", "LOC_CUSTOM, TYPE_INT64, 0, extra_ARB_timer_query" ],
 
@@ -691,6 +678,21 @@ descriptor=[
 
 # GL_ARB_texture_cube_map_array
   [ "TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB", "LOC_CUSTOM, TYPE_INT, 
TEXTURE_CUBE_ARRAY_INDEX, extra_ARB_texture_cube_map_array" ],
+]},
+
+{ "apis": ["GL", "GL_CORE", "GLES2"], "params": [
+# GL_ARB_uniform_buffer_object
+  [ "MAX_VERTEX_UNIFORM_BLOCKS", 
"CONTEXT_INT(Const.VertexProgram.MaxUniformBlocks), 
extra_ARB_uniform_buffer_object_api_es3" ],
+  [ "MAX_FRAGMENT_UNIFORM_BLOCKS", 
"CONTEXT_INT(Const.FragmentProgram.MaxUniformBlocks), 
extra_ARB_uniform_buffer_object_api_es3" ],
+  [ "MAX_GEOMETRY_UNIFORM_BLOCKS", 
"CONTEXT_INT(Const.GeometryProgram.MaxUniformBlocks), 
extra_ARB_uniform_buffer_object_and_geometry_shader" ],
+  [ "MAX_COMBINED_UNIFORM_BLOCKS", 
"CONTEXT_INT(Const.MaxCombinedUniformBlocks), 
extra_ARB_uniform_buffer_object_api_es3" ],
+  [ "MAX_UNIFORM_BLOCK_SIZE", "CONTEXT_INT(Const.MaxUniformBlockSize), 
extra_ARB_uniform_buffer_object_api_es3" ],
+  [ "MAX_UNIFORM_BUFFER_BINDINGS", 
"CONTEXT_INT(Const.MaxUniformBufferBindings), 
extra_ARB_uniform_buffer_object_api_es3" ],
+  [ "MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS", 
"CONTEXT_INT(Const.VertexProgram.MaxCombinedUniformComponents), 
extra_ARB_uniform_buffer_object" ],
+  [ "MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS", 
"CONTEXT_INT(Const.FragmentProgram.MaxCombinedUniformComponents), 
extra_ARB_uniform_buffer_object" ],
+  [ "MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS", 
"CONTEXT_INT(Const.GeometryProgram.MaxCombinedUniformComponents), 
extra_ARB_uniform_buffer_object_and_geometry_shader" ],
+  [ "UNIFORM_BUFFER_OFFSET_ALIGNMENT", 
"CONTEXT_INT(Const.UniformBufferOffsetAlignment), 
extra_ARB_uniform_buffer_object_api_es3" ],
+  [ "UNIFORM_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0, 
extra_ARB_uniform_buffer_object_api_es3" ],
 ]}
 
 ]
-- 
1.7.8.6

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev