summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2011-11-09 03:17:47 (GMT)
committerEric Anholt <eric@anholt.net>2011-11-11 16:28:12 (GMT)
commit8727807f7e218bd161d92e34f6896f4451d14de0 (patch)
treeea0d0720464b579be515103becf69024a8cc7a8f
parent1c65abb211e6a3df8c46180ae3242486ee97dc8d (diff)
i965: Expose GLSL 1.30 on gen6+.
With the gl_VertexID support, everything required should now be supported. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--src/mesa/drivers/dri/intel/intel_extensions.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 89f0920..681f5f2 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -98,7 +98,10 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.OES_EGL_image = true;
#endif
- ctx->Const.GLSLVersion = 120;
+ if (intel->gen >= 6)
+ ctx->Const.GLSLVersion = 130;
+ else
+ ctx->Const.GLSLVersion = 120;
_mesa_override_glsl_version(ctx);
if (intel->gen >= 5)