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@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 334be058f65edc7075b5e8f565759e6dcdd0b121..803d090b999534c945aa81736b3c501f155651d5 100644 (file)
--- 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 ec6274c448b683b005e071cb6f37f72ec72460dc..b3d605503f44c3226000cdf1ed41ff4262012b7e 100644 (file)
--- 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;