Mesa (master): glsl: remove special case for detecting stream duplicates
Timothy Arceri
tarceri at kemper.freedesktop.org
Mon Jan 18 02:09:38 UTC 2016
Module: Mesa
Branch: master
Commit: 9258d9f23daca39767a41abc47836991a5f189b4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9258d9f23daca39767a41abc47836991a5f189b4
Author: Timothy Arceri <timothy.arceri at collabora.com>
Date: Fri Jan 15 13:45:49 2016 +1100
glsl: remove special case for detecting stream duplicates
Any duplicates in a single declaration will already fail the
generic duplicates test due to the explicit_stream flag being set.
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
---
src/glsl/ast_type.cpp | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index 19ffe83..1f675b2 100644
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -208,11 +208,6 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
this->flags.q.stream = 1;
this->stream = state->out_qualifier->stream;
}
- } else {
- if (q.flags.q.explicit_stream) {
- _mesa_glsl_error(loc, state,
- "duplicate layout `stream' qualifier");
- }
}
}
More information about the mesa-commit
mailing list