diff options
author | Timothy Arceri <[email protected]> | 2015-11-13 18:47:55 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2015-11-21 07:27:15 +1100 |
commit | 17e224e8ec9c190fb856a60a22d8e19b8f20837e (patch) | |
tree | a9df2a3b975c1dbeef0428a32a7b6dfe7d852fdf /src/glsl/glsl_parser.yy | |
parent | efa34e4a1d09c6f140fba7ff339a989ea079e212 (diff) |
glsl: move stream layout qualifier validation
We are moving this out of the parser in preparation for compile
time constant support.
The reason a validation function is used rather than an apply
function like what is used with bindings is because glsl allows
streams to be defined on members of blocks even though they must
match the stream thats associated with the current block, this
means we need access to the value after validation to do this
comparision.
V2: Fix typo in comment (Emil)
Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/glsl/glsl_parser.yy')
-rw-r--r-- | src/glsl/glsl_parser.yy | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index a96b18087b8..b4a1652a14c 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -1514,15 +1514,8 @@ layout_qualifier_id: if (match_layout_qualifier("stream", $1, state) == 0 && state->check_explicit_attrib_stream_allowed(& @3)) { $$.flags.q.stream = 1; - - if ($3 < 0) { - _mesa_glsl_error(& @3, state, - "invalid stream %d specified", $3); - YYERROR; - } else { - $$.flags.q.explicit_stream = 1; - $$.stream = $3; - } + $$.flags.q.explicit_stream = 1; + $$.stream = $3; } } |