Mesa (master): mesa: enable glGet for EXT_gpu_shader4

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 1faf833949bd55a19b15b7bdb963dbb77aea47f8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1faf833949bd55a19b15b7bdb963dbb77aea47f8

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Aug  7 17:49:42 2018 -0400

mesa: enable glGet for EXT_gpu_shader4

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mapi/glapi/gen/EXT_gpu_shader4.xml | 4 ----
 src/mesa/main/get.c                    | 3 ++-
 src/mesa/main/get_hash_params.py       | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/src/mapi/glapi/gen/EXT_gpu_shader4.xml
index b4120b9c192..55437c0de2c 100644
--- a/src/mapi/glapi/gen/EXT_gpu_shader4.xml
+++ b/src/mapi/glapi/gen/EXT_gpu_shader4.xml
@@ -32,10 +32,6 @@
     <enum name="UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT"      value="0x8DD7"/>
     <enum name="UNSIGNED_INT_SAMPLER_BUFFER_EXT"        value="0x8DD8"/>
 
-    <!-- There is no MIN_PROGRAM_TEXEL_OFFSET_EXT in glext.h.  There is
-         MIN_PROGRAM_TEXEL_OFFSET_NV and MIN_PROGRAM_TEXEL_OFFSET (OpenGL
-         3.0).  Same goes for MAX_PROGRAM_TEXEL_OFFSET_EXT.
-    -->
     <enum name="MIN_PROGRAM_TEXEL_OFFSET"               value="0x8904">
         <size name="Get" mode="get"/>
     </enum>
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index efc9c11f79d..8a7b1e42906 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -315,9 +315,10 @@ static const int extra_EXT_texture_integer_and_new_buffers[] = {
    EXTRA_END
 };
 
-static const int extra_GLSL_130_es3[] = {
+static const int extra_GLSL_130_es3_gpushader4[] = {
    EXTRA_GLSL_130,
    EXTRA_API_ES3,
+   EXT(EXT_gpu_shader4),
    EXTRA_END
 };
 
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 60ec1a8598c..f7efb81b7c7 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -439,8 +439,8 @@ descriptor=[
   [ "READ_FRAMEBUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
 
 # GL_EXT_gpu_shader4 / GLSL 1.30
-  [ "MIN_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MinProgramTexelOffset), extra_GLSL_130_es3" ],
-  [ "MAX_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MaxProgramTexelOffset), extra_GLSL_130_es3" ],
+  [ "MIN_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MinProgramTexelOffset), extra_GLSL_130_es3_gpushader4" ],
+  [ "MAX_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MaxProgramTexelOffset), extra_GLSL_130_es3_gpushader4" ],
 
 # GL_EXT_pixel_buffer_object
   [ "PIXEL_PACK_BUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, extra_EXT_pixel_buffer_object" ],