Mesa (master): glsl: enable conservative depth, ssbo based on GLSL version

[Ilia Mirkin]

Module: Mesa
Branch: master
Commit: 4b15cb6daa29d4bdd268eac6c2e40fb1503e98fa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b15cb6daa29d4bdd268eac6c2e40fb1503e98fa

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat Jul 25 01:06:20 2015 -0400

glsl: enable conservative depth, ssbo based on GLSL version

Add in missed version checks in the GLSL parser

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

---

 src/glsl/glsl_parser.yy |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 4cce5b8..2b0c8bd 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;