summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorCarl Worth <[email protected]>2014-06-12 10:39:39 -0700
committerCarl Worth <[email protected]>2014-07-09 12:05:13 -0700
commit98c0e3c7834f8a99f7641aa14b2bab5221aa66db (patch)
tree513fa5c5d1dfcfaf7205317b7b0bbfbfe0094631 /src/Makefile.am
parent1d862a0b39dfd2723aac6c64f9a7609c205b3cdc (diff)
glsl/glcpp: Fix glcpp to catch garbage after #if 1 ... #else
Previously, a line such as: #else garbage would flag an error if it followed "#if 0", but not if it followed "#if 1". We fix this by setting a new bit of state (lexing_else) that allows the lexer to defer switching to the <SKIP> start state until after the NEWLINE following the #else directive. A new test case is added for: #if 1 #else garbage #endif which was untested before, (and did not generate the desired error). This fixes the following Khronos GLES3 CTS tests: tokens_after_else_vertex tokens_after_else_fragment Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/Makefile.am')
0 files changed, 0 insertions, 0 deletions