summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2018-02-14 23:42:08 +0100
committerMarek Olšák <marek.olsak@amd.com>2018-02-23 20:50:19 +0100
commitb8e2e9e1a1a8419f5292b0b2d9d2bdea2ce1b224 (patch)
treebbb38e13d9d88f25a15401c8da611fb4d01e007b
parenta0c8b49284efe736849c0a45920ad0a1bbd8d93d (diff)
mesa: expose ARB_enhanced_layouts in the compatibility profile
GLSL 1.40 is required. Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de> Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/mesa/drivers/dri/i965/intel_extensions.c3
-rw-r--r--src/mesa/main/extensions_table.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index cc961e051fd..5a6b12e52a4 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -172,7 +172,8 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ARB_conditional_render_inverted = true;
ctx->Extensions.ARB_cull_distance = true;
ctx->Extensions.ARB_draw_buffers_blend = true;
- ctx->Extensions.ARB_enhanced_layouts = true;
+ if (ctx->API != API_OPENGL_COMPAT)
+ ctx->Extensions.ARB_enhanced_layouts = true;
ctx->Extensions.ARB_ES3_compatibility = true;
ctx->Extensions.ARB_fragment_layer_viewport = true;
ctx->Extensions.ARB_pipeline_statistics_query = true;
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 02c97a242ab..71c9a575694 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -60,7 +60,7 @@ EXT(ARB_draw_buffers_blend , ARB_draw_buffers_blend
EXT(ARB_draw_elements_base_vertex , ARB_draw_elements_base_vertex , GLL, GLC, x , x , 2009)
EXT(ARB_draw_indirect , ARB_draw_indirect , x , GLC, x , x , 2010)
EXT(ARB_draw_instanced , ARB_draw_instanced , GLL, GLC, x , x , 2008)
-EXT(ARB_enhanced_layouts , ARB_enhanced_layouts , x , GLC, x , x , 2013)
+EXT(ARB_enhanced_layouts , ARB_enhanced_layouts , GLL, GLC, x , x , 2013)
EXT(ARB_explicit_attrib_location , ARB_explicit_attrib_location , GLL, GLC, x , x , 2009)
EXT(ARB_explicit_uniform_location , ARB_explicit_uniform_location , GLL, GLC, x , x , 2012)
EXT(ARB_fragment_coord_conventions , ARB_fragment_coord_conventions , GLL, GLC, x , x , 2009)