From bd2995c8b78382c66c4a293c668ab7095958f824 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 9 Apr 2019 18:15:34 -0400 Subject: [PATCH] glsl: allow the #extension directive within code blocks for the dri option for Viewperf 13 Acked-by: Timothy Arceri --- src/compiler/glsl/glsl_parser.yy | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index 8d6c47fb6a3..b91c24ebe97 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -2538,6 +2538,15 @@ statement_list: $$ = $1; $$->link.insert_before(& $2->link); } + | statement_list extension_statement + { + if (!state->allow_extension_directive_midshader) { + _mesa_glsl_error(& @1, state, + "#extension directive is not allowed " + "in the middle of a shader"); + YYERROR; + } + } ; expression_statement: -- 2.30.2