From 72cae2a599881e926b8709f4dfa2cc3591ea7a02 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 22 Oct 2013 09:06:37 +0100 Subject: st/mesa: respect higher GLSL levels. (v2) Limit the max glsl version level to what the state tracker supports. Reviewed-by: Brian Paul Signed-off-by: Dave Airlie --- src/mesa/state_tracker/st_extensions.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/mesa/state_tracker/st_extensions.c') diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index e8d0902d96f..cd10a0c9dea 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -594,13 +594,9 @@ 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 >= 140) { - ctx->Const.GLSLVersion = 140; - } else if (glsl_feature_level >= 130) { - ctx->Const.GLSLVersion = 130; - } else { - ctx->Const.GLSLVersion = 120; - } + ctx->Const.GLSLVersion = glsl_feature_level; + if (glsl_feature_level >= 330) + ctx->Const.GLSLVersion = 330; _mesa_override_glsl_version(st->ctx); -- cgit v1.2.3