diff options
| author | Iago Toral Quiroga <itoral@igalia.com> | 2017-01-03 09:27:09 +0100 |
|---|---|---|
| committer | Iago Toral Quiroga <itoral@igalia.com> | 2017-01-05 08:43:46 +0100 |
| commit | e3123c8ca22e9a9337af6179dfd8383259f3ccc6 (patch) | |
| tree | 178f5598e63b7865c8c26f36b505bb77e2863fba | |
| parent | 1f1b8def48f5e4015d15e6cde42b1b7705459f17 (diff) | |
i965/gen7: Enable OpenGL 4.0 in Haswell when supported
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_extensions.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index 8e67b5755a7..aa89380217c 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -136,6 +136,8 @@ intelInitExtensions(struct gl_context *ctx) if (brw->gen >= 8) ctx->Const.GLSLVersion = 450; + else if (brw->is_haswell && can_do_pipelined_register_writes(brw->screen)) + ctx->Const.GLSLVersion = 400; 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 758a328ab78..c3fd6f6685b 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1538,7 +1538,8 @@ set_max_gl_versions(struct intel_screen *screen) dri_screen->max_gl_es2_version = has_astc ? 32 : 31; break; case 7: - dri_screen->max_gl_core_version = 33; + dri_screen->max_gl_core_version = screen->devinfo.is_haswell && + can_do_pipelined_register_writes(screen) ? 40 : 33; dri_screen->max_gl_compat_version = 30; dri_screen->max_gl_es1_version = 11; dri_screen->max_gl_es2_version = screen->devinfo.is_haswell ? 31 : 30; |