From b6d6ea396c692b451b0195f07613e160b731d986 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Fri, 22 Mar 2013 14:41:17 -0700 Subject: [PATCH] i965: Turn on GLSL 1.50 and GL 3.2 support for i965 gen7. 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. Reviewed-by: Matt Turner Reviewed-by: Kenneth Graunke Reviewed-by: Chris Forbes Reviewed-by: Ian Romanick Reviewed-by: Jordan Justen --- 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 6f024b414aa..334be058f65 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 b6b4275cc00..0d2c2edaa1d 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1198,7 +1198,7 @@ set_max_gl_versions(struct intel_screen *screen) switch (screen->gen) { case 7: - psp->max_gl_core_version = 31; + psp->max_gl_core_version = 32; psp->max_gl_compat_version = 30; psp->max_gl_es1_version = 11; psp->max_gl_es2_version = 30; -- 2.30.2