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

[Matt Turner]

Fixes 2 framebuffer_blit es3conform tests.
---
 src/mesa/main/get.c              |    7 ++++++-
 src/mesa/main/get_hash_params.py |    8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index b28cf6b..43bf3b9 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -307,6 +307,12 @@ static const int extra_ARB_fragment_shader_api_es3[] = {
    EXTRA_END
 };
 
+static const int extra_EXT_framebuffer_blit_api_es3[] = {
+   EXT(EXT_framebuffer_blit),
+   EXTRA_API_ES3,
+   EXTRA_END
+};
+
 static const int 
extra_ARB_framebuffer_object_EXT_framebuffer_multisample_api_es3[] = {
    EXT(ARB_framebuffer_object),
    EXT(EXT_framebuffer_multisample),
@@ -358,7 +364,6 @@ EXTRA_EXT(EXT_stencil_two_side);
 EXTRA_EXT(EXT_depth_bounds_test);
 EXTRA_EXT(ARB_depth_clamp);
 EXTRA_EXT(ATI_fragment_shader);
-EXTRA_EXT(EXT_framebuffer_blit);
 EXTRA_EXT(ARB_shader_objects);
 EXTRA_EXT(EXT_provoking_vertex);
 EXTRA_EXT(ARB_fragment_shader);
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 944742a..1772ed2 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -569,10 +569,6 @@ descriptor=[
   [ "NUM_LOOPBACK_COMPONENTS_ATI", "CONST(3), extra_ATI_fragment_shader" ],
   [ "NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI", "CONST(3), 
extra_ATI_fragment_shader" ],
 
-# GL_EXT_framebuffer_blit
-# NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT
-  [ "READ_FRAMEBUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, 
extra_EXT_framebuffer_blit" ],
-
 # GL_EXT_provoking_vertex
   [ "PROVOKING_VERTEX_EXT", "CONTEXT_ENUM(Light.ProvokingVertex), 
extra_EXT_provoking_vertex" ],
   [ "QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT", 
"CONTEXT_BOOL(Const.QuadsFollowProvokingVertexConvention), 
extra_EXT_provoking_vertex" ],
@@ -670,6 +666,10 @@ descriptor=[
   [ "MAX_VERTEX_UNIFORM_COMPONENTS_ARB", 
"CONTEXT_INT(Const.VertexProgram.MaxUniformComponents), 
extra_ARB_vertex_shader_api_es3" ],
   [ "MAX_VARYING_FLOATS_ARB", "LOC_CUSTOM, TYPE_INT, 0, 
extra_ARB_vertex_shader" ],
 
+# GL_EXT_framebuffer_blit
+# NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT
+  [ "READ_FRAMEBUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, 
extra_EXT_framebuffer_blit_api_es3" ],
+
 # GL_ARB_framebuffer_object
   [ "MAX_SAMPLES", "CONTEXT_INT(Const.MaxSamples), 
extra_ARB_framebuffer_object_EXT_framebuffer_multisample_api_es3" ],
 
-- 
1.7.8.6

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