Mesa (master): i965: Expose GLSL 1.30 on gen6+.

Eric Anholt anholt at kemper.freedesktop.org
Fri Nov 11 16:41:15 UTC 2011


Module: Mesa
Branch: master
Commit: 8727807f7e218bd161d92e34f6896f4451d14de0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8727807f7e218bd161d92e34f6896f4451d14de0

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Nov  8 19:17:47 2011 -0800

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 at intel.com>

---

 src/mesa/drivers/dri/intel/intel_extensions.c |    5 ++++-
 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)




More information about the mesa-commit mailing list