Mesa (master): i965: Enable OpenGL 3.3 and GLSL 3.30.

[Kenneth Graunke]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Oct 17 23:14:23 2013 -0700

i965: Enable OpenGL 3.3 and GLSL 3.30.

Everything necessary for these appears to be implemented.  We'll want to
add more tests to guard against bugs, but it should be functionally
complete.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/dri/i965/intel_extensions.c |    2 +-
 src/mesa/drivers/dri/i965/intel_screen.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 334be05..803d090 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -126,7 +126,7 @@ intelInitExtensions(struct gl_context *ctx)
    ctx->Extensions.OES_EGL_image_external = true;
 
    if (brw->gen >= 7)
-      ctx->Const.GLSLVersion = 150;
+      ctx->Const.GLSLVersion = 330;
    else if (brw->gen >= 6)
       ctx->Const.GLSLVersion = 140;
    else
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index ec6274c4..b3d6055 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1187,7 +1187,7 @@ set_max_gl_versions(struct intel_screen *screen)
 
    switch (screen->devinfo->gen) {
    case 7:
-      psp->max_gl_core_version = 32;
+      psp->max_gl_core_version = 33;
       psp->max_gl_compat_version = 30;
       psp->max_gl_es1_version = 11;
       psp->max_gl_es2_version = 30;