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 <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2012-12-06 16:13:15 +10:00
parent 915efe7f07
commit 22439f24a2

View File

@@ -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;