Module: Mesa Branch: master Commit: b3c04362b44a4eceb38c938ceb387a9c04d06973 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3c04362b44a4eceb38c938ceb387a9c04d06973
Author: Francisco Jerez <[email protected]> Date: Fri Sep 20 18:36:08 2013 -0700 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]> --- 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 03cbcd1..1cdd5a9 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. _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
