[Mesa-dev] [PATCH 05/10] mesa: Allow glGet* queries on EXT_transform_feedback data in ES 3

[Matt Turner]

---
 src/mesa/main/get.c              |    7 ++++++-
 src/mesa/main/get_hash_params.py |   14 +++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index df49b58..ceefe71 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -273,6 +273,12 @@ static const int extra_EXT_fog_coord_flush_current[] = {
    EXTRA_END
 };
 
+static const int extra_EXT_transform_feedback_api_es3[] = {
+   EXT(EXT_transform_feedback),
+   EXTRA_API_ES3,
+   EXTRA_END
+};
+
 static const int extra_EXT_pixel_buffer_object_api_es3[] = {
    EXT(EXT_pixel_buffer_object),
    EXTRA_API_ES3,
@@ -337,7 +343,6 @@ EXTRA_EXT2(ARB_framebuffer_object, 
EXT_framebuffer_multisample);
 EXTRA_EXT(EXT_framebuffer_object);
 EXTRA_EXT(ARB_seamless_cube_map);
 EXTRA_EXT(ARB_vertex_shader);
-EXTRA_EXT(EXT_transform_feedback);
 EXTRA_EXT(ARB_transform_feedback2);
 EXTRA_EXT(ARB_transform_feedback3);
 EXTRA_EXT(ARB_vertex_program);
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index d609ae4..0a03e8c 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -593,13 +593,6 @@ descriptor=[
 # GL_EXT_texture_integer
   [ "RGBA_INTEGER_MODE_EXT", "BUFFER_BOOL(_IntegerColor), 
extra_EXT_texture_integer" ],
 
-# GL_EXT_transform_feedback
-  [ "TRANSFORM_FEEDBACK_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0, 
extra_EXT_transform_feedback" ],
-  [ "RASTERIZER_DISCARD", "CONTEXT_BOOL(RasterDiscard), 
extra_EXT_transform_feedback" ],
-  [ "MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS", 
"CONTEXT_INT(Const.MaxTransformFeedbackInterleavedComponents), 
extra_EXT_transform_feedback" ],
-  [ "MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS", 
"CONTEXT_INT(Const.MaxTransformFeedbackBuffers), extra_EXT_transform_feedback" 
],
-  [ "MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS", 
"CONTEXT_INT(Const.MaxTransformFeedbackSeparateComponents), 
extra_EXT_transform_feedback" ],
-
 # GL_ARB_transform_feedback2
   [ "TRANSFORM_FEEDBACK_BUFFER_PAUSED", "LOC_CUSTOM, TYPE_BOOLEAN, 0, 
extra_ARB_transform_feedback2" ],
   [ "TRANSFORM_FEEDBACK_BUFFER_ACTIVE", "LOC_CUSTOM, TYPE_BOOLEAN, 0, 
extra_ARB_transform_feedback2" ],
@@ -678,6 +671,13 @@ descriptor=[
   [ "PIXEL_PACK_BUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, 
extra_EXT_pixel_buffer_object_api_es3" ],
   [ "PIXEL_UNPACK_BUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, 
extra_EXT_pixel_buffer_object_api_es3" ],
 
+# GL_EXT_transform_feedback
+  [ "TRANSFORM_FEEDBACK_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0, 
extra_EXT_transform_feedback_api_es3" ],
+  [ "RASTERIZER_DISCARD", "CONTEXT_BOOL(RasterDiscard), 
extra_EXT_transform_feedback_api_es3" ],
+  [ "MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS", 
"CONTEXT_INT(Const.MaxTransformFeedbackInterleavedComponents), 
extra_EXT_transform_feedback_api_es3" ],
+  [ "MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS", 
"CONTEXT_INT(Const.MaxTransformFeedbackBuffers), 
extra_EXT_transform_feedback_api_es3" ],
+  [ "MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS", 
"CONTEXT_INT(Const.MaxTransformFeedbackSeparateComponents), 
extra_EXT_transform_feedback_api_es3" ],
+
 # GL_ARB_sync
   [ "MAX_SERVER_WAIT_TIMEOUT", "CONTEXT_INT64(Const.MaxServerWaitTimeout), 
extra_ARB_sync_api_es3" ],
 
-- 
1.7.8.6

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