Mesa (master): glsl: fix max binding validation for uniform blocks

Timothy Arceri tarceri at kemper.freedesktop.org
Mon Nov 23 02:47:26 UTC 2015


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

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Mon Nov 23 10:07:30 2015 +1100

glsl: fix max binding validation for uniform blocks

Regression as of 64710db66461e

We can't use the type returned by get_interface_type() as
the interface type has arrays removed.

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

---

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

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index df6dd9b..81cde73 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -6962,8 +6962,8 @@ ast_interface_block::hir(exec_list *instructions,
          delete var;
       } else {
          if (this->layout.flags.q.explicit_binding) {
-            apply_explicit_binding(state, &loc, var,
-                                   var->get_interface_type(), &this->layout);
+            apply_explicit_binding(state, &loc, var, var->type,
+                                   &this->layout);
          }
 
          var->data.stream = qual_stream;




More information about the mesa-commit mailing list