Mesa (master): glsl: Allow layout token for EXT_shader_framebuffer_fetch_non_coherent.

Francisco Jerez currojerez at kemper.freedesktop.org
Sun Feb 25 00:34:15 UTC 2018


Module: Mesa
Branch: master
Commit: 0aeec504b484cb37b856dd574974d739f35e968b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0aeec504b484cb37b856dd574974d739f35e968b

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Mon Feb 12 15:26:45 2018 -0800

glsl: Allow layout token for EXT_shader_framebuffer_fetch_non_coherent.

EXT_shader_framebuffer_fetch_non_coherent requires layout qualifiers
even on GL(ES) 2.

Reviewed-by: Plamena Manolova <plamena.manolova at intel.com>

---

 src/compiler/glsl/glsl_lexer.ll | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index ed7a80a2bb..b7cf10018d 100644
--- a/src/compiler/glsl/glsl_lexer.ll
+++ b/src/compiler/glsl/glsl_lexer.ll
@@ -502,7 +502,8 @@ layout		{
 		      || yyextra->ARB_fragment_coord_conventions_enable
                       || yyextra->ARB_shading_language_420pack_enable
                       || yyextra->ARB_compute_shader_enable
-                      || yyextra->ARB_tessellation_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);




More information about the mesa-commit mailing list