From: Ian Romanick Date: Fri, 18 Jul 2014 17:27:21 +0000 (-0700) Subject: glsl: Also track matrix layout information into structures X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=68fa4cab1a3e80d97f759253dcc392e451ab110a;p=mesa.git glsl: Also track matrix layout information into structures Signed-off-by: Ian Romanick Reviewed-by: Matt Turner --- diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 89ac84e6b06..d5699935e60 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -5203,7 +5203,13 @@ ast_process_structure_or_interface_block(exec_list *instructions, "in uniform blocks or structures."); } - if (field_type->without_array()->is_matrix()) { + /* Propogate row- / column-major information down the fields of the + * structure or interface block. Structures need this data because + * the structure may contain a structure that contains ... a matrix + * that need the proper layout. + */ + if (field_type->without_array()->is_matrix() + || field_type->without_array()->is_record()) { fields[i].matrix_layout = block_row_major ? GLSL_MATRIX_LAYOUT_ROW_MAJOR : GLSL_MATRIX_LAYOUT_COLUMN_MAJOR;