summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/compiler/glsl/ast_type.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp
index b10ea3b787a..3431e242811 100644
--- a/src/compiler/glsl/ast_type.cpp
+++ b/src/compiler/glsl/ast_type.cpp
@@ -802,12 +802,7 @@ ast_layout_expression::process_qualifier_constant(struct _mesa_glsl_parse_state
return false;
}
- /* From section 4.4 "Layout Qualifiers" of the GLSL 4.50 spec:
- * "When the same layout-qualifier-name occurs multiple times,
- * in a single declaration, the last occurrence overrides the
- * former occurrence(s)."
- */
- if (!state->has_420pack() && !first_pass && *value != const_int->value.u[0]) {
+ if (!first_pass && *value != const_int->value.u[0]) {
YYLTYPE loc = const_expression->get_location();
_mesa_glsl_error(&loc, state, "%s layout qualifier does not "
"match previous declaration (%d vs %d)",