From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Sun, 22 Nov 2015 23:07:30 +0000 (+1100)
Subject: glsl: fix max binding validation for uniform blocks
X-Git-Tag: upstream/17.1.0~14304
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6463d36394bf95f73cfe3ba6bdf900da431e4e55;p=platform%2Fupstream%2Fmesa.git

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@collabora.com>
---

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;