OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eac2cec
)
glsl: remove special case for detecting stream duplicates
author
Timothy Arceri
<timothy.arceri@collabora.com>
Fri, 15 Jan 2016 02:45:49 +0000
(13:45 +1100)
committer
Timothy Arceri
<timothy.arceri@collabora.com>
Mon, 18 Jan 2016 02:09:28 +0000
(13:09 +1100)
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@igalia.com>
src/glsl/ast_type.cpp
patch
|
blob
|
history
diff --git
a/src/glsl/ast_type.cpp
b/src/glsl/ast_type.cpp
index
19ffe83
..
1f675b2
100644
(file)
--- 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");
- }
}
}