Mesa (master): glsl: Drop duplicate error messages.
Matt Turner
mattst88 at kemper.freedesktop.org
Thu Aug 22 06:06:27 UTC 2013
Module: Mesa
Branch: master
Commit: 77373e020ecc1b156802a583745dc6ce16e91c9e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=77373e020ecc1b156802a583745dc6ce16e91c9e
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Aug 15 10:46:46 2013 -0700
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 at intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
---
src/glsl/ast_to_hir.cpp | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 06b3a52..ac86c42 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2297,13 +2297,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);
}
}
@@ -4476,11 +4470,6 @@ ast_process_structure_or_interface_block(exec_list *instructions,
_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");
} else
validate_matrix_layout_for_type(state, &loc, field_type);
}
More information about the mesa-commit
mailing list