diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_extensions.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index b7c64c6ae2c..4e6627e8f61 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -243,10 +243,8 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.OES_standard_derivatives = true; ctx->Extensions.OES_EGL_image_external = true; - if (brw->gen >= 7) + if (brw->gen >= 6) ctx->Const.GLSLVersion = 330; - else if (brw->gen >= 6) - ctx->Const.GLSLVersion = 150; else ctx->Const.GLSLVersion = 120; _mesa_override_glsl_version(&ctx->Const); diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 8070e9708c5..41964eca961 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1269,13 +1269,8 @@ set_max_gl_versions(struct intel_screen *screen) switch (screen->devinfo->gen) { case 8: case 7: - psp->max_gl_core_version = 33; - psp->max_gl_compat_version = 30; - psp->max_gl_es1_version = 11; - psp->max_gl_es2_version = 30; - break; case 6: - 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; |