summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
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/drivers
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/drivers')
-rwxr-xr-xsrc/mesa/drivers/dri/intel/intel_extensions.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 96288ab2fe1..df886a5cdfd 100755
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -89,11 +89,7 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ARB_texture_rgb10_a2ui = true;
if (intel->gen >= 6)
- if (ctx->API == API_OPENGL_CORE) {
- ctx->Const.GLSLVersion = 140;
- } else {
- ctx->Const.GLSLVersion = 130;
- }
+ ctx->Const.GLSLVersion = 140;
else
ctx->Const.GLSLVersion = 120;
_mesa_override_glsl_version(ctx);