summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/st_extensions.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-12-08 22:48:47 +0100
committerMarek Olšák <[email protected]>2012-12-12 13:09:54 +0100
commit0ac83a20010ae5fa1635866d1950f06aac15a46d (patch)
treee5fe61920b3cec79e76f314cfe053f91bffa810a /src/mesa/state_tracker/st_extensions.c
parent25409c6da8163d9acb386511aef0c11577c7aadb (diff)
mesa: disallow creation of GL 3.1 compatibility contexts
Death to driver-specific hacks! Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_extensions.c')
-rw-r--r--src/mesa/state_tracker/st_extensions.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 93ef7a91cf7..726d86846a9 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -570,10 +570,7 @@ void st_init_extensions(struct st_context *st)
glsl_feature_level = screen->get_param(screen, PIPE_CAP_GLSL_FEATURE_LEVEL);
if (glsl_feature_level >= 140) {
- if (ctx->API == API_OPENGL_CORE)
- ctx->Const.GLSLVersion = 140;
- else
- ctx->Const.GLSLVersion = 130;
+ ctx->Const.GLSLVersion = 140;
} else if (glsl_feature_level >= 130) {
ctx->Const.GLSLVersion = 130;
} else {