diff options
| author | Marek Olšák <[email protected]> | 2014-07-08 20:20:22 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-07-18 01:58:58 +0200 |
| commit | b0ff18bd3441ce7f28354686934440a92826eaf8 (patch) | |
| tree | 5e5828d8da6124a40b0a18d138b60905c6b5ecab /src/glsl/glsl_parser.yy | |
| parent | 392c9f8dfe11034c44aeec72217e6f12dce20490 (diff) | |
glsl: add a mechanism to allow #extension directives in the middle of shaders
This is needed to make Unigine Heaven 4.0 and Unigine Valley 1.0 work
with sample shading.
Also, if this is disabled, the error message at least makes sense now.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/glsl_parser.yy')
| -rw-r--r-- | src/glsl/glsl_parser.yy | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index b9897498ff7..4c871633f0e 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -376,6 +376,14 @@ external_declaration_list: if ($2 != NULL) state->translation_unit.push_tail(& $2->link); } + | external_declaration_list extension_statement { + if (!state->allow_extension_directive_midshader) { + _mesa_glsl_error(& @2, state, + "#extension directive is not allowed " + "in the middle of a shader"); + YYERROR; + } + } ; variable_identifier: |