Commit 72cae2a5 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie

st/mesa: respect higher GLSL levels. (v2)

Limit the max glsl version level to what the state tracker supports.
Reviewed-by: Brian Paul's avatarBrian Paul <brianp@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 3c9f0096
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment