diff options
| author | Ilia Mirkin <[email protected]> | 2015-07-25 01:06:20 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2015-07-27 12:11:00 -0400 |
| commit | 4b15cb6daa29d4bdd268eac6c2e40fb1503e98fa (patch) | |
| tree | 0f30c07f280bf71a63a4c06c41f4cd4a89d6d775 /src/glsl | |
| parent | d69da58e84448188808488ad1c1c0181b5630a74 (diff) | |
glsl: enable conservative depth, ssbo based on GLSL version
Add in missed version checks in the GLSL parser
Signed-off-by: Ilia Mirkin <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/glsl_parser.yy | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 4cce5b8b284..2b0c8bd8c6f 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -1166,7 +1166,8 @@ layout_qualifier_id: /* Layout qualifiers for AMD/ARB_conservative_depth. */ if (!$$.flags.i && (state->AMD_conservative_depth_enable || - state->ARB_conservative_depth_enable)) { + state->ARB_conservative_depth_enable || + state->is_version(420, 0))) { if (match_layout_qualifier($1, "depth_any", state) == 0) { $$.flags.q.depth_any = 1; } else if (match_layout_qualifier($1, "depth_greater", state) == 0) { @@ -1460,7 +1461,7 @@ layout_qualifier_id: if ((state->has_420pack() || state->has_atomic_counters() || - state->ARB_shader_storage_buffer_object_enable) && + state->has_shader_storage_buffer_objects()) && match_layout_qualifier("binding", $1, state) == 0) { $$.flags.q.explicit_binding = 1; $$.binding = $3; |