diff options
| author | Dave Airlie <[email protected]> | 2012-12-06 16:13:15 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2012-12-08 13:32:34 +1000 |
| commit | 22439f24a2403aaf8428a80da23fc95fc16454fa (patch) | |
| tree | 6e3be3bd043f007da3122781228378c1fa2f22b1 /src/mesa/state_tracker | |
| parent | 915efe7f07a370827be9872fbf93cf9fc304ba24 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 7 |
1 files changed, 6 insertions, 1 deletions
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; |