diff options
| author | Juan A. Suarez Romero <[email protected]> | 2017-03-29 11:41:35 +0200 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2017-04-14 16:13:21 -0700 |
| commit | 1877982aca7d50541618a8997fdd72c5286b4b67 (patch) | |
| tree | 32ba1c5273bbcffd0cfa008b24faaad4e7d30c29 /src/mesa | |
| parent | 92d4dc76eaec64e99194f3d2afcc55eb7c7b46ba (diff) | |
i965: enable OpenGL 4.2 in Ivybridge
Reviewed-by: Andreas Boll <[email protected]>
Reviewed-by: Francisco Jerez <[email protected]>
Diffstat (limited to 'src/mesa')
| -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 fc974b98607..0133fa10068 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -139,7 +139,7 @@ intelInitExtensions(struct gl_context *ctx) else if (brw->is_haswell && can_do_pipelined_register_writes(brw->screen)) ctx->Const.GLSLVersion = 450; else if (brw->gen >= 7 && can_do_pipelined_register_writes(brw->screen)) - ctx->Const.GLSLVersion = 400; + ctx->Const.GLSLVersion = 420; 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 9e536f58b32..39e463d264d 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1654,7 +1654,7 @@ set_max_gl_versions(struct intel_screen *screen) case 7: dri_screen->max_gl_core_version = 33; if (can_do_pipelined_register_writes(screen)) { - dri_screen->max_gl_core_version = screen->devinfo.is_haswell ? 42 : 40; + dri_screen->max_gl_core_version = 42; if (screen->devinfo.is_haswell && can_do_compute_dispatch(screen)) dri_screen->max_gl_core_version = 43; if (screen->devinfo.is_haswell && can_do_mi_math_and_lrr(screen)) |