[Mesa-dev] [PATCH 1/5] glsl: add missing explicit_stream flag to has_layout()

Timothy Arceri timothy.arceri at collabora.com
Thu Jan 14 18:45:48 PST 2016


This will allow the ARB_shading_language_420pack rules in
glsl_parser.yy for catching duplicate layout qualifiers to be
triggered for the stream identifier rather than relying on the
code meant to catch duplicates within a single layout(...)

Cc: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
---
 src/glsl/ast_type.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index 8643b7b..19ffe83 100644
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -76,7 +76,8 @@ ast_type_qualifier::has_layout() const
           || this->flags.q.explicit_location
           || this->flags.q.explicit_index
           || this->flags.q.explicit_binding
-          || this->flags.q.explicit_offset;
+          || this->flags.q.explicit_offset
+          || this->flags.q.explicit_stream;
 }
 
 bool
-- 
2.4.3



More information about the mesa-dev mailing list