summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/glsl_parser_extras.cpp
diff options
context:
space:
mode:
authorTimothy Arceri <timothy.arceri@collabora.com>2016-02-26 10:59:14 +1100
committerTimothy Arceri <timothy.arceri@collabora.com>2016-03-05 19:07:04 +1100
commitbd53cc7b450b288fec707a27fb2902aa83fc2831 (patch)
tree5dba14a4a18406e8af67e8e590d19d20e64c4c04 /src/compiler/glsl/glsl_parser_extras.cpp
parent78d3098c05cfbf5c51cf92483d1f894a41e46e7c (diff)
downloadexternal_mesa3d-bd53cc7b450b288fec707a27fb2902aa83fc2831.zip
external_mesa3d-bd53cc7b450b288fec707a27fb2902aa83fc2831.tar.gz
external_mesa3d-bd53cc7b450b288fec707a27fb2902aa83fc2831.tar.bz2
glsl: only apply default stream to output blocks
This is needed to allow invalid qualifier checks on inputs. Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Diffstat (limited to 'src/compiler/glsl/glsl_parser_extras.cpp')
-rw-r--r--src/compiler/glsl/glsl_parser_extras.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index 7a6f5c0..7e4a891 100644
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -924,7 +924,8 @@ _mesa_ast_process_interface_block(YYLTYPE *locp,
block->layout.flags.i |= block_interface_qualifier;
if (state->stage == MESA_SHADER_GEOMETRY &&
- state->has_explicit_attrib_stream()) {
+ state->has_explicit_attrib_stream() &&
+ block->layout.flags.q.out) {
/* Assign global layout's stream value. */
block->layout.flags.q.stream = 1;
block->layout.flags.q.explicit_stream = 0;