Mesa (master): glsl: Also track matrix layout information into structures
Ian Romanick
idr at kemper.freedesktop.org
Mon Aug 4 21:40:44 UTC 2014
Module: Mesa
Branch: master
Commit: 68fa4cab1a3e80d97f759253dcc392e451ab110a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=68fa4cab1a3e80d97f759253dcc392e451ab110a
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Jul 18 10:27:21 2014 -0700
glsl: Also track matrix layout information into structures
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/glsl/ast_to_hir.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 89ac84e..d569993 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;
More information about the mesa-commit
mailing list