Mesa (master): glsl: validate binding qualifier on block members

Tapani Pälli tpalli at kemper.freedesktop.org
Fri Oct 2 07:50:53 UTC 2015


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

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Fri Oct  2 10:08:55 2015 +0300

glsl: validate binding qualifier on block members

Fixes following Piglit test:
	member-invalid-binding-qualifier.frag

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>

---

 src/glsl/ast_to_hir.cpp |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 6899a55..7bcf182 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 ||




More information about the mesa-commit mailing list