[Mesa-dev] [PATCH] glsl: fix max binding validation for uniform blocks

Timothy Arceri t_arceri at yahoo.com.au
Sun Nov 22 15:12:25 PST 2015


From: Timothy Arceri <timothy.arceri at collabora.com>

Regression as of 64710db66461e

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

Cc: 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 7f67657..9fd274b 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -7000,8 +7000,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;
-- 
2.4.3



More information about the mesa-dev mailing list