From 74d7ff2efda8e33e097ed6e3f9853fc1c8d45618 Mon Sep 17 00:00:00 2001 From: Samuel Iglesias Gonsalvez Date: Wed, 9 Jul 2014 13:19:34 +0200 Subject: 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 Reviewed-by: Matt Turner Reviewed-by: Jordan Justen Acked-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/intel_extensions.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/i965/intel_extensions.c') diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index 046d2a1..b7c64c6 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; -- cgit v1.1