glsl: add missing explicit_stream flag to has_layout()
authorTimothy Arceri <timothy.arceri@collabora.com>
Fri, 15 Jan 2016 02:45:48 +0000 (13:45 +1100)
committerTimothy Arceri <timothy.arceri@collabora.com>
Mon, 18 Jan 2016 02:09:16 +0000 (13:09 +1100)
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>
src/glsl/ast_type.cpp

index 8643b7bfb761df00bb8cad3746099c7afe9649c8..19ffe833164a2e3c30f398d5a5ffd6a8f895ca15 100644 (file)
@@ -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