i965: Enable OpenGL 4.5.

Everything is in place.  There are still conformance issues to sort out,
but we may as well turn it on in master.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 87c77104e65d6245c5ef7eac75266af025dfa1cd..66079b5fdd849c3e4760a46dad2ddf3bd6c477d3 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -271,7 +271,7 @@ intelInitExtensions(struct gl_context *ctx)
    ctx->Extensions.OES_texture_half_float_linear = true;
 
    if (brw->gen >= 8)
-      ctx->Const.GLSLVersion = 440;
+      ctx->Const.GLSLVersion = 450;
    else if (brw->gen >= 6)
       ctx->Const.GLSLVersion = 330;
    else

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 9b23bacb9aa1e2bc89924c4972b4a35bcb25907d..e1c3c19ec89b7226101148e25f6a1d929d4de65c 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1439,7 +1439,7 @@ set_max_gl_versions(struct intel_screen *screen)
    switch (screen->devinfo.gen) {
    case 9:
    case 8:
-      dri_screen->max_gl_core_version = 44;
+      dri_screen->max_gl_core_version = 45;
       dri_screen->max_gl_compat_version = 30;
       dri_screen->max_gl_es1_version = 11;
       dri_screen->max_gl_es2_version = has_astc ? 32 : 31;