summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2013-08-15 10:46:46 -0700
committerIan Romanick <ian.d.romanick@intel.com>2013-08-22 11:49:40 -0700
commit368fc4f3ec56e89a40269f3798457edacd790cd7 (patch)
tree6020fcb44bbc5b2e598373a13fd1e0a8c6ecb6d5
parente14baf425b6bd55198642adccf7a169850c37c86 (diff)
glsl: Drop duplicate error messages.
This same message is printed in the validate_matrix_layout_for_type function. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com> (cherry picked from commit 77373e020ecc1b156802a583745dc6ce16e91c9e)
-rw-r--r--src/glsl/ast_to_hir.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 0532e2f7e85..fddd3fc9da0 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2282,13 +2282,7 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
}
if (qual->flags.q.row_major || qual->flags.q.column_major) {
- if (!ubo_qualifiers_allowed) {
- _mesa_glsl_error(loc, state,
- "uniform block layout qualifiers row_major and "
- "column_major can only be applied to uniform block "
- "members");
- } else
- validate_matrix_layout_for_type(state, loc, var->type);
+ validate_matrix_layout_for_type(state, loc, var->type);
}
}
@@ -4349,12 +4343,7 @@ ast_process_structure_or_interface_block(exec_list *instructions,
if (!qual->flags.q.uniform) {
_mesa_glsl_error(&loc, state,
"row_major and column_major can only be "
- "applied to uniform interface blocks.");
- } else if (!field_type->is_matrix() && !field_type->is_record()) {
- _mesa_glsl_error(&loc, state,
- "uniform block layout qualifiers row_major and "
- "column_major can only be applied to matrix and "
- "structure types");
+ "applied to uniform interface blocks");
} else
validate_matrix_layout_for_type(state, &loc, field_type);
}