summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorAlejandro Piñeiro <[email protected]>2016-04-26 14:35:24 +0200
committerAlejandro Piñeiro <[email protected]>2016-05-17 09:05:55 +0200
commite5e412cd272989fa801a027ab5dce7de48eb79c6 (patch)
tree07704e59d2f97e4a0c80d1d7030e6f8358e85b88 /src/mesa
parentf051eae25a820638b6e9712a6e8936b4eb04bc5b (diff)
i965: Expose OpenGL 4.2 for gen8+
ARB_vertex_attrib_64bit was the only feature missing. v2: we can expose 4.2 instead of 4.1 (Ian Romanick) Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/intel_extensions.c2
-rw-r--r--src/mesa/drivers/dri/i965/intel_screen.c2
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 957e3637d2e..8b4f6853bf7 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -268,7 +268,7 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.OES_texture_half_float_linear = true;
if (brw->gen >= 8)
- 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 c2efc6ed200..1a0541a6c7c 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 = 40;
+ psp->max_gl_core_version = 42;
psp->max_gl_compat_version = 30;
psp->max_gl_es1_version = 11;
psp->max_gl_es2_version = 31;