Subject: [PATCH] Fix version requirements for GL_ARB_gpu_shader5

Requirements for GL_ARB_gpu_shader5
From https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_gpu_shader5.txt
This extension interacts with ARB_gpu_shader_fp64.
This extension interacts with NV_gpu_shader5.
This extension interacts with ARB_sample_shading.
This extension interacts with ARB_texture_gather.
OpenGL 3.2 and GLSL 1.50 are required.
---
 src/mesa/main/version.c                |  2 +-
 src/mesa/state_tracker/st_extensions.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 84babd69e2f..782c5e85fca 100755
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -307,6 +307,7 @@ compute_version(const struct gl_extensions *extensions,
                          extensions->ARB_depth_clamp &&
                          extensions->ARB_draw_elements_base_vertex &&
                          extensions->ARB_fragment_coord_conventions &&
+                         extensions->ARB_gpu_shader5 &&
                          extensions->EXT_provoking_vertex &&
                          extensions->ARB_seamless_cube_map &&
                          extensions->ARB_sync &&
@@ -329,7 +330,6 @@ compute_version(const struct gl_extensions *extensions,
                          consts->GLSLVersion >= 400 &&
                          extensions->ARB_draw_buffers_blend &&
                          extensions->ARB_draw_indirect &&
-                         extensions->ARB_gpu_shader5 &&
                          extensions->ARB_gpu_shader_fp64 &&
                          extensions->ARB_sample_shading &&
                          extensions->ARB_tessellation_shader &&
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index f81b5b35279..97bf7977509 100755
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -963,7 +963,18 @@ void st_init_extensions(struct pipe_screen *screen,
 
    consts->AllowGLSLCrossStageInterpolationMismatch = options->allow_glsl_cross_stage_interpolation_mismatch;
 
-   if (consts->GLSLVersion >= 400)
+/* Requirements for GL_ARB_gpu_shader5
+*  From https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_gpu_shader5.txt
+*  This extension interacts with ARB_gpu_shader_fp64.
+*  This extension interacts with NV_gpu_shader5.
+*  This extension interacts with ARB_sample_shading.
+*  This extension interacts with ARB_texture_gather.
+*  OpenGL 3.2 and GLSL 1.50 are required.
+*  From https://www.khronos.org/registry/OpenGL/extensions/NV/NV_gpu_shader5.txt
+*  If implemented in OpenGL ES, OpenGL ES 3.1 and GLSL ES 3.10 are required.
+*/
+
+   if (consts->GLSLVersion >= 150)
       extensions->ARB_gpu_shader5 = GL_TRUE;
    if (consts->GLSLVersion >= 410)
       extensions->ARB_shader_precision = GL_TRUE;
-- 
2.14.1