i965: enable OpenGL 4.0 to Ivybridge/Baytrail

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
Samuel Iglesias Gonsálvez 2016-08-26 07:39:04 +02:00 committed by Francisco Jerez
parent cd0a6b2fc2
commit a494afdb8e
2 changed files with 6 additions and 5 deletions

View file

@ -138,6 +138,8 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Const.GLSLVersion = 450;
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;
else if (brw->gen >= 6)
ctx->Const.GLSLVersion = 330;
else

View file

@ -1653,12 +1653,11 @@ set_max_gl_versions(struct intel_screen *screen)
break;
case 7:
dri_screen->max_gl_core_version = 33;
if (screen->devinfo.is_haswell &&
can_do_pipelined_register_writes(screen)) {
dri_screen->max_gl_core_version = 42;
if (can_do_compute_dispatch(screen))
if (can_do_pipelined_register_writes(screen)) {
dri_screen->max_gl_core_version = screen->devinfo.is_haswell ? 42 : 40;
if (screen->devinfo.is_haswell && can_do_compute_dispatch(screen))
dri_screen->max_gl_core_version = 43;
if (can_do_mi_math_and_lrr(screen))
if (screen->devinfo.is_haswell && can_do_mi_math_and_lrr(screen))
dri_screen->max_gl_core_version = 45;
}
dri_screen->max_gl_compat_version = 30;