summaryrefslogtreecommitdiffstats
path: root/src/glsl/glcpp/glcpp-parse.y
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2014-06-11 22:04:09 -0700
committerCarl Worth <[email protected]>2014-07-29 15:11:50 -0700
commitde0b4b6607c755257a63a72d0079ef9f2aaccbc2 (patch)
treebd70b030ac2136090e23405610ef0516f22d3fb6 /src/glsl/glcpp/glcpp-parse.y
parentf196eb2d39d334b3ac8fbc5c0513dcb25e725155 (diff)
glsl: Properly lex extra tokens when handling # directives.
Without this, in the <PP> state, we would hit Flex's default rule, which prints tokens to stdout, rather than returning them as tokens. (Or, after the previous commit, we would hit the new catch-all rule and generate an internal compiler error.) With this commit in place, we generate the desired syntax error. This manifested as a weird bug where shaders with semicolons after extension directives, such as: #extension GL_foo_bar : enable; would print semicolons to the screen, but otherwise compile just fine (even though this is illegal). Fixes Piglit's extension-semicolon.frag test. This also fixes the following Khronos GLES3 conformance tests, (and for real this time): invalid_char_in_name_vertex invalid_char_in_name_fragment Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Carl Worth <[email protected]> Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/glsl/glcpp/glcpp-parse.y')
0 files changed, 0 insertions, 0 deletions