Mesa (master): glsl: set stage flag for structs and arrays in resource list
Timothy Arceri
tarceri at kemper.freedesktop.org
Thu Jul 30 09:33:44 UTC 2015
Module: Mesa
Branch: master
Commit: 75a96cedf7b0e5613560be0962dec973a4d2f2fe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=75a96cedf7b0e5613560be0962dec973a4d2f2fe
Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date: Sat Jul 4 15:43:15 2015 +1000
glsl: set stage flag for structs and arrays in resource list
This fixes the remaining failing tests in:
ES31-CTS.program_interface_query.uniform-types
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
---
src/glsl/linker.cpp | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index a781211..a16dab4 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -3129,9 +3129,19 @@ build_stageref(struct gl_shader_program *shProg, const char *name)
*/
foreach_in_list(ir_instruction, node, sh->ir) {
ir_variable *var = node->as_variable();
- if (var && strcmp(var->name, name) == 0) {
- stages |= (1 << i);
- break;
+ if (var) {
+ unsigned baselen = strlen(var->name);
+ if (strncmp(var->name, name, baselen) == 0) {
+ /* Check for exact name matches but also check for arrays and
+ * structs.
+ */
+ if (name[baselen] == '\0' ||
+ name[baselen] == '[' ||
+ name[baselen] == '.') {
+ stages |= (1 << i);
+ break;
+ }
+ }
}
}
}
More information about the mesa-commit
mailing list