summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIago Toral Quiroga <[email protected]>2016-02-23 12:15:36 +0100
committerSamuel Iglesias Gonsálvez <[email protected]>2016-05-16 09:55:34 +0200
commit71465179fc45820dabf933146fb16f044a7363d7 (patch)
tree8d2ffe5bac2a85e4ebe949d9bc2c281f9ee7f45a
parentb1d21e11590738333889fbfd1e04be330052f016 (diff)
i965: Expose OpenGL 4.0 for gen8+
ARB_gpu_shader_fp64 was the only feature missing. Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/intel_extensions.c4
-rw-r--r--src/mesa/drivers/dri/i965/intel_screen.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 67552bf0613..362a7e558d5 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -267,7 +267,9 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.OES_texture_half_float = true;
ctx->Extensions.OES_texture_half_float_linear = true;
- if (brw->gen >= 6)
+ if (brw->gen >= 8)
+ ctx->Const.GLSLVersion = 400;
+ else if (brw->gen >= 6)
ctx->Const.GLSLVersion = 330;
else
ctx->Const.GLSLVersion = 120;
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index f9b54842eb9..c2efc6ed200 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1376,7 +1376,7 @@ set_max_gl_versions(struct intel_screen *screen)
switch (screen->devinfo->gen) {
case 9:
case 8:
- psp->max_gl_core_version = 33;
+ psp->max_gl_core_version = 40;
psp->max_gl_compat_version = 30;
psp->max_gl_es1_version = 11;
psp->max_gl_es2_version = 31;