Mesa (master): glsl: initialise record array count to 1
Timothy Arceri
tarceri at kemper.freedesktop.org
Fri Oct 16 21:50:48 UTC 2015
Module: Mesa
Branch: master
Commit: 698cdbf49207c30bc2ac38e2f16e531dd3a54db3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=698cdbf49207c30bc2ac38e2f16e531dd3a54db3
Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date: Thu Oct 15 14:10:35 2015 +1100
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 at amd.com>
Cc: Jason Ekstrand <jason at jlekstrand.net>
---
src/glsl/link_uniforms.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 647aa2b..fe00aa3 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);
}
}
More information about the mesa-commit
mailing list