AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Matt Turner
2013-08-15 10:46:46 -07:00
parent 1a45db9705
commit 77373e020e
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glsl/ast_to_hir.cpp
+1 -12
View File
@@ -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);
}