diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2017-01-13 22:53:34 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2017-01-16 10:13:23 -0800 |
| commit | d2590eb65ff28a9cbd592353d15d7e6cbd2c6fc6 (patch) | |
| tree | 3de724021985a9e85617d0d828de73126f8e9cc0 | |
| parent | d5234156097ec34d77d7159ddfdb0b7fdaa7e3b0 (diff) | |
i965: Enable OpenGL 4.5 on Haswell.
Everything is in place and the test results look solid.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_extensions.c | 2 | ||||
| -rw-r--r-- | 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 7a40ebaa424..b674b2f494c 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -137,7 +137,7 @@ 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 = 420; + 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 a8d401cdffa..6ae211da3a1 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1539,7 +1539,7 @@ set_max_gl_versions(struct intel_screen *screen) break; case 7: dri_screen->max_gl_core_version = screen->devinfo.is_haswell && - can_do_pipelined_register_writes(screen) ? 42 : 33; + can_do_pipelined_register_writes(screen) ? 45 : 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; |