diff options
| author | Francisco Jerez <[email protected]> | 2013-09-20 18:36:08 -0700 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2013-10-06 12:55:14 -0700 |
| commit | b3c04362b44a4eceb38c938ceb387a9c04d06973 (patch) | |
| tree | 95ab6587e97eaa342f98b8cdbb17f5e0e17dace8 | |
| parent | 373f8670d1c670003674e1eaa7c1f0cd823a0431 (diff) | |
glsl: Fix usage of the wrong union member in program_resource_visitor::recursion.
In the array-of-struct case, recursion() takes the row_major flag for
each iteration from 't->fields.structure[i]', but 't' is not a record
type. Inherit the array declaration row_major flag instead.
This mistake was found by running piglit on valgrind.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69449
Cc: "9.1 9.2" <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Tested-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/glsl/link_uniforms.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp index 03cbcd1ce20..1cdd5a922b1 100644 --- a/src/glsl/link_uniforms.cpp +++ b/src/glsl/link_uniforms.cpp @@ -140,8 +140,8 @@ program_resource_visitor::recursion(const glsl_type *t, char **name, /* Append the subscript to the current variable name */ ralloc_asprintf_rewrite_tail(name, &new_length, "[%u]", i); - recursion(t->fields.array, name, new_length, - t->fields.structure[i].row_major, record_type); + recursion(t->fields.array, name, new_length, row_major, + record_type); /* Only the first leaf-field of the record gets called with the * record type pointer. |