From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sat, 25 Jul 2015 05:06:20 +0000 (-0400)
Subject: glsl: enable conservative depth, ssbo based on GLSL version
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4b15cb6daa29d4bdd268eac6c2e40fb1503e98fa;p=mesa.git

glsl: enable conservative depth, ssbo based on GLSL version

Add in missed version checks in the GLSL parser

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
---

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;