st/mesa: expose EXT_gpu_shader4 if GLSL 1.40 is supported

Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/docs/relnotes/19.1.0.html b/docs/relnotes/19.1.0.html
index af516c2c4d922c479122c560304e154b91e8444c..950b595d200c39153f8bc1d019bbf10c5bedafb9 100644 (file)
--- a/docs/relnotes/19.1.0.html
+++ b/docs/relnotes/19.1.0.html
@@ -40,7 +40,9 @@ TBD.
 
 <ul>
 <li>GL_ARB_parallel_shader_compile on all drivers.</li>
+<li>GL_EXT_gpu_shader4 on all GL 3.1 drivers.</li>
 <li>GL_EXT_shader_image_load_formatted on radeonsi.</li>
+<li>GL_EXT_texture_buffer_object on all GL 3.1 drivers.</li>
 <li>GL_EXT_texture_compression_s3tc_srgb on Gallium drivers and i965 (ES extension).</li>
 <li>GL_NV_compute_shader_derivatives on iris and i965.</li>
 <li>GL_KHR_parallel_shader_compile on all drivers.</li>

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index cebc35a76a71bbcd14eae42c6b7fbc135b16d23f..7562213907e256afbdc663e0425eb617a7fc8dc3 100644 (file)
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1107,6 +1107,13 @@ void st_init_extensions(struct pipe_screen *screen,
    }
 
    if (GLSLVersion >= 140) {
+      /* Since GLSL 1.40 has support for all of the features of gpu_shader4,
+       * we can always expose it if the driver can do 140. Supporting
+       * gpu_shader4 on drivers without GLSL 1.40 is left for a future
+       * pipe cap.
+       */
+      extensions->EXT_gpu_shader4 = GL_TRUE;
+
       if (screen->get_param(screen, PIPE_CAP_TGSI_ARRAY_COMPONENTS))
          extensions->ARB_enhanced_layouts = GL_TRUE;
    }