Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>

On 23.05.2018 22:58, Marek Olšák wrote:
From: Marek Olšák <marek.ol...@amd.com>

This requires layered FBOs from GL 3.2.

Gallium drivers don't expose this yet due to:
     "st/mesa: use PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY"
---
  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 395fec916be..c34d0101558 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -189,21 +189,22 @@ intelInitExtensions(struct gl_context *ctx)
        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;
        }
        ctx->Extensions.ARB_texture_cube_map_array = true;
        ctx->Extensions.ARB_texture_gather = true;
        ctx->Extensions.ARB_texture_multisample = true;
        ctx->Extensions.ARB_uniform_buffer_object = true;
- ctx->Extensions.AMD_vertex_shader_layer = true;
+      if (ctx->API != API_OPENGL_COMPAT)
+         ctx->Extensions.AMD_vertex_shader_layer = true;
        ctx->Extensions.EXT_framebuffer_multisample = true;
        ctx->Extensions.EXT_framebuffer_multisample_blit_scaled = true;
        ctx->Extensions.EXT_transform_feedback = true;
        ctx->Extensions.ARB_transform_feedback_overflow_query = true;
        ctx->Extensions.OES_depth_texture_cube_map = true;
        ctx->Extensions.OES_sample_variables = true;
ctx->Extensions.ARB_timer_query = brw->screen->hw_has_timestamp;
        ctx->Extensions.EXT_disjoint_timer_query =
           ctx->Extensions.ARB_timer_query;
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index ffb1caccddf..ef1c05cb6ce 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -8,21 +8,21 @@
EXT(3DFX_texture_compression_FXT1 , TDFX_texture_compression_FXT1 , GLL, GLC, x , x , 1999) EXT(AMD_conservative_depth , ARB_conservative_depth , GLL, GLC, x , x , 2009)
  EXT(AMD_draw_buffers_blend                  , ARB_draw_buffers_blend          
       , GLL, GLC,  x ,  x , 2009)
  EXT(AMD_performance_monitor                 , AMD_performance_monitor         
       , GLL, GLC,  x ,  x , 2007)
  EXT(AMD_pinned_memory                       , AMD_pinned_memory               
       , GLL, GLC,  x ,  x , 2013)
  EXT(AMD_seamless_cubemap_per_texture        , 
AMD_seamless_cubemap_per_texture       , GLL, GLC,  x ,  x , 2009)
  EXT(AMD_shader_stencil_export               , ARB_shader_stencil_export       
       , GLL, GLC,  x ,  x , 2009)
  EXT(AMD_shader_trinary_minmax               , dummy_true                      
       , GLL, GLC,  x ,  x , 2012)
-EXT(AMD_vertex_shader_layer                 , AMD_vertex_shader_layer          
      ,  x , GLC,  x ,  x , 2012)
+EXT(AMD_vertex_shader_layer                 , AMD_vertex_shader_layer          
      , GLL, GLC,  x ,  x , 2012)
  EXT(AMD_vertex_shader_viewport_index        , 
AMD_vertex_shader_viewport_index       ,  x , GLC,  x ,  x , 2012)
EXT(ANDROID_extension_pack_es31a , ANDROID_extension_pack_es31a , x , x , x , 31, 2014) EXT(ANGLE_texture_compression_dxt3 , ANGLE_texture_compression_dxt , GLL, GLC, ES1, ES2, 2011)
  EXT(ANGLE_texture_compression_dxt5          , ANGLE_texture_compression_dxt   
       , GLL, GLC, ES1, ES2, 2011)
EXT(APPLE_object_purgeable , APPLE_object_purgeable , GLL, GLC, x , x , 2006)
  EXT(APPLE_packed_pixels                     , dummy_true                      
       , GLL,  x ,  x ,  x , 2002)
  EXT(APPLE_texture_max_level                 , dummy_true                      
       ,  x ,  x , ES1, ES2, 2009)



--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to