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

[Matt Turner]

---
 src/mesa/main/get.c              |    8 +++++++-
 src/mesa/main/get_hash_params.py |    6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 62c16ac..9b9d995 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -301,6 +301,13 @@ static const int extra_texture_buffer_object[] = {
    EXTRA_END
 };
 
+static const int 
extra_ARB_framebuffer_object_EXT_framebuffer_multisample_api_es3[] = {
+   EXT(ARB_framebuffer_object),
+   EXT(EXT_framebuffer_multisample),
+   EXTRA_API_ES3,
+   EXTRA_END
+};
+
 static const int extra_ARB_sync_api_es3[] = {
    EXT(ARB_sync),
    EXTRA_API_ES3,
@@ -345,7 +352,6 @@ EXTRA_EXT(ARB_shader_objects);
 EXTRA_EXT(EXT_provoking_vertex);
 EXTRA_EXT(ARB_fragment_shader);
 EXTRA_EXT(ARB_fragment_program);
-EXTRA_EXT2(ARB_framebuffer_object, EXT_framebuffer_multisample);
 EXTRA_EXT(EXT_framebuffer_object);
 EXTRA_EXT(ARB_seamless_cube_map);
 EXTRA_EXT(ARB_vertex_shader);
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index e502642..730eedc 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -584,9 +584,6 @@ descriptor=[
   [ "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" ],
 
-# GL_ARB_framebuffer_object
-  [ "MAX_SAMPLES", "CONTEXT_INT(Const.MaxSamples), 
extra_ARB_framebuffer_object_EXT_framebuffer_multisample" ],
-
 # GL_ARB_seamless_cube_map
   [ "TEXTURE_CUBE_MAP_SEAMLESS", "CONTEXT_BOOL(Texture.CubeMapSeamless), 
extra_ARB_seamless_cube_map" ],
 
@@ -673,6 +670,9 @@ descriptor=[
   [ "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_framebuffer_object
+  [ "MAX_SAMPLES", "CONTEXT_INT(Const.MaxSamples), 
extra_ARB_framebuffer_object_EXT_framebuffer_multisample_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