summaryrefslogtreecommitdiffstats
path: root/src/glsl/ast_to_hir.cpp
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2014-07-19 14:41:04 -0700
committerIan Romanick <[email protected]>2014-08-04 14:40:06 -0700
commit6305caea521fb2c7f82100db490f03d279185c43 (patch)
treed1713ec44e5005f1847e3f93ac91918b6a841ec3 /src/glsl/ast_to_hir.cpp
parent22f7a46d74d702b84de77d4465069776e34f617d (diff)
glsl: Use the without_array predicate to simplify some code
Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Matt Turner <[email protected]> [v1] Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/glsl/ast_to_hir.cpp')
-rw-r--r--src/glsl/ast_to_hir.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 7249a06c928..397a575501d 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -5203,8 +5203,7 @@ ast_process_structure_or_interface_block(exec_list *instructions,
"in uniform blocks or structures.");
}
- if (field_type->is_matrix() ||
- (field_type->is_array() && field_type->fields.array->is_matrix())) {
+ if (field_type->without_array()->is_matrix()) {
fields[i].row_major = block_row_major;
if (qual->flags.q.row_major)
fields[i].row_major = true;