From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Wed, 21 Oct 2015 02:44:10 +0000 (+1100)
Subject: glsl: check for arrays of arrays when assigning explicit locations
X-Git-Tag: upstream/17.1.0~15180
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38ceeeadaa2f5f0a21dba9f5339fbc4cba66dece;p=platform%2Fupstream%2Fmesa.git

glsl: check for arrays of arrays when assigning explicit locations

This fixes assigning explicit locations in the CTS test:

ES31-CTS.explicit_uniform_location.uniform-loc-arrays-of-arrays

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
---

diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 6efde5c..8183e65 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -763,7 +763,8 @@ private:
       /* Assign explicit locations. */
       if (current_var->data.explicit_location) {
          /* Set sequential locations for struct fields. */
-         if (current_var->type->without_array()->is_record()) {
+         if (current_var->type->without_array()->is_record() ||
+             current_var->type->is_array_of_arrays()) {
             const unsigned entries = MAX2(1, this->uniforms[id].array_elements);
             this->uniforms[id].remap_location =
                this->explicit_location + field_counter;