summaryrefslogtreecommitdiff
path: root/src/glsl/glcpp
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-12-07 10:47:50 -0800
committerKenneth Graunke <kenneth@whitecape.org>2010-12-07 10:52:36 -0800
commit800eed6765d43d35a338d3135b3204fa6a318afd (patch)
treecfc8f3b049e9a9369b53a7ea297544240934bbe5 /src/glsl/glcpp
parentd8b861987d32444586e786cb39c6ef1c7498ae9b (diff)
glcpp: Don't emit SPACE tokens in conditional_tokens production.
Fixes glslparsertest defined-01.vert. Reported-by: José Fonseca <jfonseca@vmware.com> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Carl Worth <cworth@cworth.org>
Diffstat (limited to 'src/glsl/glcpp')
-rw-r--r--src/glsl/glcpp/glcpp-parse.y1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 8475e08f00..558ad0acac 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -472,7 +472,6 @@ conditional_token:
conditional_tokens:
/* Exactly the same as pp_tokens, but using conditional_token */
conditional_token {
- parser->space_tokens = 1;
$$ = _token_list_create (parser);
_token_list_append ($$, $1);
talloc_unlink (parser, $1);