From 6f1edf3cbf0ce4cb8e95f2d8bd68c9c26d3f840c Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sat, 9 Aug 2014 20:00:20 -0400 Subject: [PATCH] mesa/st: enable ARB_gpu_shader5 if the reported GLSL version >= 400 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The ARB_gpu_shader5 extension is made up of a lot of small sub-parts. Instead of adding PIPE_CAP's for each of these, just rely on the GLSL version reported by the pipe driver. The remaining extensions lend themselves naturally to being checked through a single CAP. Signed-off-by: Ilia Mirkin Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_extensions.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 22c15628947..eace3218a3f 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -657,6 +657,9 @@ void st_init_extensions(struct pipe_screen *screen, consts->ForceGLSLVersion = options->force_glsl_version; } + if (glsl_feature_level >= 400) + extensions->ARB_gpu_shader5 = GL_TRUE; + /* This extension needs full OpenGL 3.2, but we don't know if that's * supported at this point. Only check the GLSL version. */ if (consts->GLSLVersion >= 150 && -- 2.30.2