From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Thu, 15 Oct 2015 03:10:35 +0000 (+1100)
Subject: glsl: initialise record array count to 1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=698cdbf49207c30bc2ac38e2f16e531dd3a54db3;p=mesa.git

glsl: initialise record array count to 1

This was only being done in one of the two process methods.

Fixes an issue with samplers using the array size of a previous record.

Tested-by: Marek Olšák <marek.olsak@amd.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 647aa2bbdd8..fe00aa30d07 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -161,6 +161,7 @@ program_resource_visitor::process(ir_variable *var)
                 false, record_array_count);
       ralloc_free(name);
    } else {
+      this->set_record_array_count(record_array_count);
       this->visit_field(t, var->name, row_major, NULL, packing, false);
    }
 }