aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2019-04-09 18:15:34 -0400
committerMarek Olšák <[email protected]>2019-04-12 11:34:39 -0400
commitbd2995c8b78382c66c4a293c668ab7095958f824 (patch)
tree1faf193dbdb32eee45079699b1093bada1fa1fe2 /src
parent6718bb57acb9872fb6e2f628d8e501dcf311e184 (diff)
glsl: allow the #extension directive within code blocks for the dri option
for Viewperf 13 Acked-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/compiler/glsl/glsl_parser.yy9
1 files changed, 9 insertions, 0 deletions
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: