[Mesa-dev] [PATCH 1/3] i965: Turn on GLSL 1.50 and GL 3.2 support for i965 gen7.

[Paul Berry]

Geometry shaders were the last thing we needed to finish before
turning on GLSL 1.50 and GL 3.2 support.  They are now working well,
with just a few piglit failures left to fix.
---
 src/mesa/drivers/dri/i965/intel_extensions.c | 4 +++-
 src/mesa/drivers/dri/i965/intel_screen.c     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 6f024b4..334be05 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -125,7 +125,9 @@ intelInitExtensions(struct gl_context *ctx)
    ctx->Extensions.OES_standard_derivatives = true;
    ctx->Extensions.OES_EGL_image_external = true;
 
-   if (brw->gen >= 6)
+   if (brw->gen >= 7)
+      ctx->Const.GLSLVersion = 150;
+   else if (brw->gen >= 6)
       ctx->Const.GLSLVersion = 140;
    else
       ctx->Const.GLSLVersion = 120;
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index cddc8e8..3761170 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1224,7 +1224,7 @@ set_max_gl_versions(struct intel_screen *screen)
 
    switch (screen->gen) {
    case 7:
-      screen->max_gl_core_version = 31;
+      screen->max_gl_core_version = 32;
       screen->max_gl_compat_version = 30;
       screen->max_gl_es1_version = 11;
       screen->max_gl_es2_version = 30;
-- 
1.8.4