Mesa (master): glsl: don't validate binding when its not needed

[Timothy Arceri]

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

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Fri Nov 13 11:41:52 2015 +1100

glsl: don't validate binding when its not needed

Checking that the flag has been set is all the validation thats
needed here.

Also not calling the binding validation function will make things
much simpler when adding compile time constant support as we
won't need to resolve the binding value.

Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/glsl/ast_to_hir.cpp |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 9856f16..97e2351 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -6133,8 +6133,11 @@ ast_process_struct_or_iface_block_members(exec_list *instructions,
                           "uniform block");
       }
 
-      if (qual->flags.q.explicit_binding)
-         validate_binding_qualifier(state, &loc, decl_type, qual);
+      if (qual->flags.q.explicit_binding) {
+         _mesa_glsl_error(&loc, state,
+                          "binding layout qualifier cannot be applied "
+                          "to struct or interface block members");
+      }
 
       if (qual->flags.q.std140 ||
           qual->flags.q.std430 ||