summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorSamuel Iglesias Gonsalvez <[email protected]>2014-07-09 13:19:34 +0200
committerIago Toral Quiroga <[email protected]>2014-09-19 15:01:16 +0200
commit74d7ff2efda8e33e097ed6e3f9853fc1c8d45618 (patch)
treee2d4a92e9d245b5a046006d952c552fa7761abb4 /src/mesa/drivers
parentd2c2ca9ee81dd1bd9139e8820f5d696ba9f2e430 (diff)
i965/gen6: enable GLSL 1.50, OpenGL 3.2 and GL_AMD_vertex_shader_layered
Geometry shaders was the only thing we needed to enable GLSL 1.50 and OpenGL 3.2 in gen6. v2: Layered clears do not work properly in gen6 with OpenGL 3.2. Kenneth and Jordan realized that for this to work we also need GL_AMD_vertex_shader_layered (which requires OpenGL 3.2, so it could not be enabled before this patch), so we agreed to enable this together with OpenGL 3.2 in this patch. Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-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, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 046d2a1b9a5..b7c64c6ae2c 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -246,7 +246,7 @@ intelInitExtensions(struct gl_context *ctx)
if (brw->gen >= 7)
ctx->Const.GLSLVersion = 330;
else if (brw->gen >= 6)
- ctx->Const.GLSLVersion = 140;
+ ctx->Const.GLSLVersion = 150;
else
ctx->Const.GLSLVersion = 120;
_mesa_override_glsl_version(&ctx->Const);
@@ -273,6 +273,7 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ARB_sample_shading = true;
ctx->Extensions.ARB_texture_gather = true;
ctx->Extensions.ARB_conditional_render_inverted = true;
+ ctx->Extensions.AMD_vertex_shader_layer = true;
/* Test if the kernel has the ioctl. */
if (drm_intel_reg_read(brw->bufmgr, TIMESTAMP, &dummy) == 0)
@@ -289,7 +290,6 @@ intelInitExtensions(struct gl_context *ctx)
if (brw->gen >= 7) {
ctx->Extensions.ARB_conservative_depth = true;
ctx->Extensions.ARB_texture_view = true;
- ctx->Extensions.AMD_vertex_shader_layer = true;
if (can_do_pipelined_register_writes(brw)) {
ctx->Extensions.ARB_transform_feedback2 = true;
ctx->Extensions.ARB_transform_feedback3 = true;
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index db7feb2257c..8070e9708c5 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1275,7 +1275,7 @@ set_max_gl_versions(struct intel_screen *screen)
psp->max_gl_es2_version = 30;
break;
case 6:
- psp->max_gl_core_version = 31;
+ psp->max_gl_core_version = 32;
psp->max_gl_compat_version = 30;
psp->max_gl_es1_version = 11;
psp->max_gl_es2_version = 30;