diff options
| author | Chris Forbes <[email protected]> | 2014-08-10 21:38:23 +1200 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2015-07-23 17:25:23 +1000 |
| commit | d16ff8ac783874c8ee74ef796b1c853829ff237d (patch) | |
| tree | 8aee5e3976b1b3bc6a5ff52556c16c9c2f142332 | |
| parent | 24b0e5068348aacabbd3e0012de95d34866e4b99 (diff) | |
glsl: Make `subroutine` a reserved keyword
Reviewed-by: Tapani Pälli <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Signed-off-by: Chris Forbes <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index fe0083fe745..1cd1ffb98c6 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/glsl/glsl_lexer.ll @@ -579,7 +579,7 @@ usamplerBuffer KEYWORD(140, 300, 140, 0, USAMPLERBUFFER); /* Additional reserved words in GLSL ES 3.00 */ resource KEYWORD(0, 300, 0, 0, RESOURCE); sample KEYWORD_WITH_ALT(400, 300, 400, 0, yyextra->ARB_gpu_shader5_enable, SAMPLE); -subroutine KEYWORD(0, 300, 0, 0, SUBROUTINE); +subroutine KEYWORD_WITH_ALT(400, 300, 400, 0, yyextra->ARB_shader_subroutine_enable, SUBROUTINE); [_a-zA-Z][_a-zA-Z0-9]* { |