From eac2cece3143e07f0f229df15ab757b4f265b9a3 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Fri, 15 Jan 2016 13:45:48 +1100 Subject: [PATCH] glsl: add missing explicit_stream flag to has_layout() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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(...) Reviewed-by: Samuel Iglesias Gonsálvez --- 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 8643b7bfb76..19ffe833164 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.30.2