From 22439f24a2403aaf8428a80da23fc95fc16454fa Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 6 Dec 2012 16:13:15 +1000 Subject: [PATCH] st/mesa: add option to enable GLSL 1.40 Allow GLSL 1.40 to be enabled if the driver advertises it. Signed-off-by: Dave Airlie --- src/mesa/state_tracker/st_extensions.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 0c6179577c6..ca762cab4b2 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -553,7 +553,12 @@ void st_init_extensions(struct st_context *st) /* Figure out GLSL support. */ glsl_feature_level = screen->get_param(screen, PIPE_CAP_GLSL_FEATURE_LEVEL); - if (glsl_feature_level >= 130) { + if (glsl_feature_level >= 140) { + if (ctx->API == API_OPENGL_CORE) + ctx->Const.GLSLVersion = 140; + else + ctx->Const.GLSLVersion = 130; + } else if (glsl_feature_level >= 130) { ctx->Const.GLSLVersion = 130; } else { ctx->Const.GLSLVersion = 120; -- 2.30.2