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

[Matt Turner]

Fixes the sync_coverage_max_server_wait_timeout test in es3conform.
---
 src/mesa/main/get.c              |    7 ++++++-
 src/mesa/main/get_hash_params.py |    6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index ab96d19..df49b58 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -295,6 +295,12 @@ static const int extra_texture_buffer_object[] = {
    EXTRA_END
 };
 
+static const int extra_ARB_sync_api_es3[] = {
+   EXT(ARB_sync),
+   EXTRA_API_ES3,
+   EXTRA_END
+};
+
 static const int extra_ARB_uniform_buffer_object_api_es3[] = {
    EXT(ARB_uniform_buffer_object),
    EXTRA_API_ES3,
@@ -330,7 +336,6 @@ 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_sync);
 EXTRA_EXT(ARB_vertex_shader);
 EXTRA_EXT(EXT_transform_feedback);
 EXTRA_EXT(ARB_transform_feedback2);
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 3d28ffd..d609ae4 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -590,9 +590,6 @@ descriptor=[
 # GL_ARB_seamless_cube_map
   [ "TEXTURE_CUBE_MAP_SEAMLESS", "CONTEXT_BOOL(Texture.CubeMapSeamless), 
extra_ARB_seamless_cube_map" ],
 
-# GL_ARB_sync
-  [ "MAX_SERVER_WAIT_TIMEOUT", "CONTEXT_INT64(Const.MaxServerWaitTimeout), 
extra_ARB_sync" ],
-
 # GL_EXT_texture_integer
   [ "RGBA_INTEGER_MODE_EXT", "BUFFER_BOOL(_IntegerColor), 
extra_EXT_texture_integer" ],
 
@@ -681,6 +678,9 @@ 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_ARB_sync
+  [ "MAX_SERVER_WAIT_TIMEOUT", "CONTEXT_INT64(Const.MaxServerWaitTimeout), 
extra_ARB_sync_api_es3" ],
+
 # 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" ],
-- 
1.7.8.6

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