fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 05:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Drop duplicate error messages.

Browse source 
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 77373e020e)
This commit is contained in:
Matt Turner 2013-08-15 10:46:46 -07:00 • committed by Ian Romanick
parent e14baf425b
commit 368fc4f3ec
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/glsl/ast_to_hir.cpp
View file

@ -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);
}