summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-01-15 13:45:48 +1100
committerTimothy Arceri <[email protected]>2016-01-18 13:09:16 +1100
commiteac2cece3143e07f0f229df15ab757b4f265b9a3 (patch)
tree55ba61ce4b3648ffde024596f36d6a076914011f
parent86677f101641c75d52577e3cd9e76441b1228b21 (diff)
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 <[email protected]>
-rw-r--r--src/glsl/ast_type.cpp3
1 files changed, 2 insertions, 1 deletions
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