[Mesa-dev] [PATCH 1/8] mesa: expose ARB_post_depth_coverage in the Compatibility profile
From: Marek Olšák
It only contains GLSL changes.
v2: allow the layout qualifier on GLSL <= 1.30
---
src/compiler/glsl/glsl_lexer.ll | 1 +
src/mesa/main/extensions_table.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index 87b64e09c16..964e937a481 100644
--- a/src/compiler/glsl/glsl_lexer.ll
+++ b/src/compiler/glsl/glsl_lexer.ll
@@ -490,20 +490,21 @@ structreturn STRUCT;
void return VOID_TOK;
layout {
if ((yyextra->is_version(140, 300))
|| yyextra->ARB_bindless_texture_enable
|| yyextra->KHR_blend_equation_advanced_enable
|| yyextra->AMD_conservative_depth_enable
|| yyextra->ARB_conservative_depth_enable
|| yyextra->ARB_explicit_attrib_location_enable
|| yyextra->ARB_explicit_uniform_location_enable
+ || yyextra->ARB_post_depth_coverage
|| yyextra->has_separate_shader_objects()
|| yyextra->ARB_uniform_buffer_object_enable
|| yyextra->ARB_fragment_coord_conventions_enable
|| yyextra->ARB_shading_language_420pack_enable
|| yyextra->ARB_compute_shader_enable
|| yyextra->ARB_tessellation_shader_enable
||
yyextra->EXT_shader_framebuffer_fetch_non_coherent_enable) {
return LAYOUT_TOK;
} else {
return classify_identifier(yyextra, yytext, yyleng,
yylval);
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index af5ce118da4..3bd824b2dfe 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -92,21 +92,21 @@ EXT(ARB_multi_bind , dummy_true
EXT(ARB_multi_draw_indirect , ARB_draw_indirect
, GLL, GLC, x , x , 2012)
EXT(ARB_multisample , dummy_true
, GLL, x , x , x , 1994)
EXT(ARB_multitexture, dummy_true
, GLL, x , x , x , 1998)
EXT(ARB_occlusion_query , ARB_occlusion_query
, GLL, x , x , x , 2001)
EXT(ARB_occlusion_query2, ARB_occlusion_query2
, GLL, GLC, x , x , 2003)
EXT(ARB_pipeline_statistics_query , ARB_pipeline_statistics_query
, GLL, GLC, x , x , 2014)
EXT(ARB_pixel_buffer_object , EXT_pixel_buffer_object
, GLL, GLC, x , x , 2004)
EXT(ARB_point_parameters, EXT_point_parameters
, GLL, x , x , x , 1997)
EXT(ARB_point_sprite, ARB_point_sprite
, GLL, GLC, x , x , 2003)
EXT(ARB_polygon_offset_clamp, ARB_polygon_offset_clamp
, GLL, GLC, x , x , 2017)
-EXT(ARB_post_depth_coverage , ARB_post_depth_coverage
, x , GLC, x , x, 2015)
+EXT(ARB_post_depth_coverage , ARB_post_depth_coverage
, GLL, GLC, x , x, 2015)
EXT(ARB_program_interface_query , dummy_true
, GLL, GLC, x , x , 2012)
EXT(ARB_provoking_vertex, EXT_provoking_vertex
, GLL, GLC, x , x , 2009)
EXT(ARB_query_buffer_object , ARB_query_buffer_object
, GLL, GLC, x , x , 2013)
EXT(ARB_robust_buffer_access_behavior ,
ARB_robust_buffer_access_behavior , GLL, GLC, x , x , 2012)
EXT(ARB_robustness , dummy_true
, GLL, GLC, x , x , 2010)
EXT(ARB_sample_locations, ARB_sample_locations
, GLL, GLC, x , x , 2015)
EXT(ARB_sample_shading , ARB_sample_shading
, GLL, GLC, x , x , 2009)
EXT(ARB_sampler_objects , dummy_true
, GLL, GLC, x , x , 2009)
EXT(ARB_seamless_cube_map , ARB_seamless_cube_map
, GLL, GLC, x , x , 2009)
EXT(ARB_seamless_cubemap_per_texture, AMD_seamless_cubemap_per_texture
, GLL, GLC, x , x , 2013)
--
2.17.1
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/8] mesa: expose ARB_post_depth_coverage in the Compatibility profile
On 08/08/2018 07:12 PM, Marek Olšák wrote: > From: Marek Olšák > > It only contains GLSL changes. This will probably need some other changes. This extension requires the use of the layout keyword, and we only enable that in early GLSL versions when certain extensions are enabled. > --- > src/mesa/main/extensions_table.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/mesa/main/extensions_table.h > b/src/mesa/main/extensions_table.h > index bdba49d5380..b4c1b203c57 100644 > --- a/src/mesa/main/extensions_table.h > +++ b/src/mesa/main/extensions_table.h > @@ -92,21 +92,21 @@ EXT(ARB_multi_bind , dummy_true > EXT(ARB_multi_draw_indirect , ARB_draw_indirect > , GLL, GLC, x , x , 2012) > EXT(ARB_multisample , dummy_true > , GLL, x , x , x , 1994) > EXT(ARB_multitexture, dummy_true > , GLL, x , x , x , 1998) > EXT(ARB_occlusion_query , ARB_occlusion_query > , GLL, x , x , x , 2001) > EXT(ARB_occlusion_query2, ARB_occlusion_query2 > , GLL, GLC, x , x , 2003) > EXT(ARB_pipeline_statistics_query , ARB_pipeline_statistics_query > , GLL, GLC, x , x , 2014) > EXT(ARB_pixel_buffer_object , EXT_pixel_buffer_object > , GLL, GLC, x , x , 2004) > EXT(ARB_point_parameters, EXT_point_parameters > , GLL, x , x , x , 1997) > EXT(ARB_point_sprite, ARB_point_sprite > , GLL, GLC, x , x , 2003) > EXT(ARB_polygon_offset_clamp, ARB_polygon_offset_clamp > , GLL, GLC, x , x , 2017) > -EXT(ARB_post_depth_coverage , ARB_post_depth_coverage > , x , GLC, x , x, 2015) > +EXT(ARB_post_depth_coverage , ARB_post_depth_coverage > , GLL, GLC, x , x, 2015) > EXT(ARB_program_interface_query , dummy_true > , GLL, GLC, x , x , 2012) > EXT(ARB_provoking_vertex, EXT_provoking_vertex > , GLL, GLC, x , x , 2009) > EXT(ARB_query_buffer_object , ARB_query_buffer_object > , GLL, GLC, x , x , 2013) > EXT(ARB_robust_buffer_access_behavior , > ARB_robust_buffer_access_behavior , GLL, GLC, x , x , 2012) > EXT(ARB_robustness , dummy_true > , GLL, GLC, x , x , 2010) > EXT(ARB_sample_locations, ARB_sample_locations > , GLL, GLC, x , x , 2015) > EXT(ARB_sample_shading , ARB_sample_shading > , GLL, GLC, x , x , 2009) > EXT(ARB_sampler_objects , dummy_true > , GLL, GLC, x , x , 2009) > EXT(ARB_seamless_cube_map , ARB_seamless_cube_map > , GLL, GLC, x , x , 2009) > EXT(ARB_seamless_cubemap_per_texture, > AMD_seamless_cubemap_per_texture , GLL, GLC, x , x , 2013) > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/8] mesa: expose ARB_post_depth_coverage in the Compatibility profile
From: Marek Olšák It only contains GLSL changes. --- src/mesa/main/extensions_table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index bdba49d5380..b4c1b203c57 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -92,21 +92,21 @@ EXT(ARB_multi_bind , dummy_true EXT(ARB_multi_draw_indirect , ARB_draw_indirect , GLL, GLC, x , x , 2012) EXT(ARB_multisample , dummy_true , GLL, x , x , x , 1994) EXT(ARB_multitexture, dummy_true , GLL, x , x , x , 1998) EXT(ARB_occlusion_query , ARB_occlusion_query , GLL, x , x , x , 2001) EXT(ARB_occlusion_query2, ARB_occlusion_query2 , GLL, GLC, x , x , 2003) EXT(ARB_pipeline_statistics_query , ARB_pipeline_statistics_query , GLL, GLC, x , x , 2014) EXT(ARB_pixel_buffer_object , EXT_pixel_buffer_object , GLL, GLC, x , x , 2004) EXT(ARB_point_parameters, EXT_point_parameters , GLL, x , x , x , 1997) EXT(ARB_point_sprite, ARB_point_sprite , GLL, GLC, x , x , 2003) EXT(ARB_polygon_offset_clamp, ARB_polygon_offset_clamp , GLL, GLC, x , x , 2017) -EXT(ARB_post_depth_coverage , ARB_post_depth_coverage , x , GLC, x , x, 2015) +EXT(ARB_post_depth_coverage , ARB_post_depth_coverage , GLL, GLC, x , x, 2015) EXT(ARB_program_interface_query , dummy_true , GLL, GLC, x , x , 2012) EXT(ARB_provoking_vertex, EXT_provoking_vertex , GLL, GLC, x , x , 2009) EXT(ARB_query_buffer_object , ARB_query_buffer_object , GLL, GLC, x , x , 2013) EXT(ARB_robust_buffer_access_behavior , ARB_robust_buffer_access_behavior , GLL, GLC, x , x , 2012) EXT(ARB_robustness , dummy_true , GLL, GLC, x , x , 2010) EXT(ARB_sample_locations, ARB_sample_locations , GLL, GLC, x , x , 2015) EXT(ARB_sample_shading , ARB_sample_shading , GLL, GLC, x , x , 2009) EXT(ARB_sampler_objects , dummy_true , GLL, GLC, x , x , 2009) EXT(ARB_seamless_cube_map , ARB_seamless_cube_map , GLL, GLC, x , x , 2009) EXT(ARB_seamless_cubemap_per_texture, AMD_seamless_cubemap_per_texture , GLL, GLC, x , x , 2013) -- 2.17.1 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
