summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTapani Pälli <[email protected]>2015-10-02 10:08:55 +0300
committerTapani Pälli <[email protected]>2015-10-02 10:50:42 +0300
commit85313ff8ab1e3fad9679e05a97a7fd55ecf87291 (patch)
tree265847742653a7171bd4bd8bf59c54f8f576c00d
parentf42466322a3c6f9dacf17caaf2b8f411e41ba7aa (diff)
glsl: validate binding qualifier on block members
Fixes following Piglit test: member-invalid-binding-qualifier.frag Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
-rw-r--r--src/glsl/ast_to_hir.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 6899a554f2c..7bcf1820b19 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -5765,6 +5765,10 @@ ast_process_structure_or_interface_block(exec_list *instructions,
const struct ast_type_qualifier *const qual =
& decl_list->type->qualifier;
+
+ if (qual->flags.q.explicit_binding)
+ validate_binding_qualifier(state, &loc, decl_type, qual);
+
if (qual->flags.q.std140 ||
qual->flags.q.std430 ||
qual->flags.q.packed ||