diff options
| author | Kenneth Graunke <[email protected]> | 2018-02-19 09:35:46 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2018-02-21 17:50:57 -0800 |
| commit | 183ce5e629ee973d72a3e8b3361aa2de196cc203 (patch) | |
| tree | 8f38dd70607da94f1f7e260d6317c2a46977f389 /src | |
| parent | c7e22483febd2f21452f8dff8f987c998f9a75f5 (diff) | |
glsl: Parse 'layout' as a token with advanced blending or bindless
Both KHR_blend_equation_advanced and ARB_bindless_texture provide
layout qualifiers, and are exposed in compatibility contexts. We
need to parse the layout qualifier as a token in order for those
to work, but forgot to extend this check.
ARB_shader_image_load_store would need a similar treatment, but we
don't expose that in legacy OpenGL contexts.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105161
Reviewed-by: Iago Toral Quiroga <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/glsl/glsl_lexer.ll | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll index 4b36574b73a..ed7a80a2bb1 100644 --- a/src/compiler/glsl/glsl_lexer.ll +++ b/src/compiler/glsl/glsl_lexer.ll @@ -491,6 +491,8 @@ void return VOID_TOK; layout { if ((yyextra->is_version(140, 300)) + || yyextra->ARB_bindless_texture_enable + || yyextra->KHR_blend_equation_advanced_enable || yyextra->AMD_conservative_depth_enable || yyextra->ARB_conservative_depth_enable || yyextra->ARB_explicit_attrib_location_enable |