From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Fri, 15 Jan 2016 02:45:48 +0000 (+1100)
Subject: glsl: add missing explicit_stream flag to has_layout()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eac2cece3143e07f0f229df15ab757b4f265b9a3;p=mesa.git

glsl: add missing explicit_stream flag to has_layout()

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 <siglesias@igalia.com>
---

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