From: Marek Olšák <marek.ol...@amd.com>
GLSL 1.40 is required.
---
src/mesa/drivers/dri/i965/intel_extensions.c | 3 ++-
src/mesa/main/extensions_table.h | 2 +-
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 cc961e0..5a6b12e 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -165,21 +165,22 @@ intelInitExtensions(struct gl_context *ctx)
if (devinfo->gen == 6)
ctx->Extensions.ARB_transform_feedback2 = true;
if (devinfo->gen >= 6) {
ctx->Extensions.ARB_blend_func_extended =
!driQueryOptionb(&brw->optionCache, "disable_blend_func_extended");
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;
ctx->Extensions.ARB_sample_shading = true;
ctx->Extensions.ARB_shading_language_420pack = true;
if (ctx->API != API_OPENGL_COMPAT) {
ctx->Extensions.ARB_texture_buffer_object = true;
ctx->Extensions.ARB_texture_buffer_object_rgb32 = true;
ctx->Extensions.ARB_texture_buffer_range = true;
}
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 02c97a2..71c9a57 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -53,21 +53,21 @@ EXT(ARB_debug_output , dummy_true
EXT(ARB_depth_buffer_float , ARB_depth_buffer_float
, GLL, GLC, x , x , 2008)
EXT(ARB_depth_clamp , ARB_depth_clamp
, GLL, GLC, x , x , 2003)
EXT(ARB_depth_texture , ARB_depth_texture
, GLL, x , x , x , 2001)
EXT(ARB_derivative_control , ARB_derivative_control
, GLL, GLC, x , x , 2014)
EXT(ARB_direct_state_access , dummy_true
, x , GLC, x , x , 2014)
EXT(ARB_draw_buffers , dummy_true
, GLL, GLC, x , x , 2002)
EXT(ARB_draw_buffers_blend , ARB_draw_buffers_blend
, GLL, GLC, x , x , 2009)
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)
EXT(ARB_fragment_layer_viewport , ARB_fragment_layer_viewport
, x , GLC, x , x , 2012)
EXT(ARB_fragment_program , ARB_fragment_program
, GLL, x , x , x , 2002)
EXT(ARB_fragment_program_shadow , ARB_fragment_program_shadow
, GLL, x , x , x , 2003)
EXT(ARB_fragment_shader , ARB_fragment_shader
, GLL, GLC, x , x , 2002)
EXT(ARB_framebuffer_no_attachments , ARB_framebuffer_no_attachments
, GLL, GLC, x , x , 2012)
EXT(ARB_framebuffer_object , ARB_framebuffer_object
, GLL, GLC, x , x , 2005)
EXT(ARB_framebuffer_sRGB , EXT_framebuffer_sRGB
, GLL, GLC, x , x , 1998)
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
