diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2015-04-28 13:15:46 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2015-05-04 13:49:58 -0700 |
commit | 6c9c317cafdaefdec01389778fd96300022c37ab (patch) | |
tree | 140c89290efbb9c6f8773f03dffa277707158f6b /src/glsl/glsl_parser.yy | |
parent | fa3475b26931fceeeda7ee7f5ffa61927aacaafb (diff) |
glsl: Add glsl_parser_state::has_atomic_counters helper
v2: Change GL version from 400 to 420. Noticed by Tapani and Ilia.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Diffstat (limited to 'src/glsl/glsl_parser.yy')
-rw-r--r-- | src/glsl/glsl_parser.yy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index a3ba3f6d0f..3ce9e103f2 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -1425,13 +1425,13 @@ layout_qualifier_id: } if ((state->ARB_shading_language_420pack_enable || - state->ARB_shader_atomic_counters_enable) && + state->has_atomic_counters()) && match_layout_qualifier("binding", $1, state) == 0) { $$.flags.q.explicit_binding = 1; $$.binding = $3; } - if (state->ARB_shader_atomic_counters_enable && + if (state->has_atomic_counters() && match_layout_qualifier("offset", $1, state) == 0) { $$.flags.q.explicit_offset = 1; $$.offset = $3; |