glsl/glcpp: Fix NULL directives when followed by a single-line comment
authorCarl Worth <cworth@cworth.org>
Wed, 2 Jul 2014 00:58:37 +0000 (17:58 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Thu, 7 Aug 2014 23:08:29 +0000 (16:08 -0700)
commitc0127c30ddf0d10c38c36288e44187ec59ccf838
tree4c4cfeae45ca4c595e8d1b446e6182fc4eaf7d84
parente84e159caac200287f1aada3c5c57aa3bf5cc376
glsl/glcpp: Fix NULL directives when followed by a single-line comment

This is the fix for the following line:

#  // comment to ignore here

According to the translation-phase rules, the comment should be removed before
the preprocessor looks to interpret the null directive.

So in our implementation we must explicitly look for single-line comments in
the <HASH> start condition as well.

This commit fixes the following Khronos GLES3 CTS tests:

null_directive_vertex
null_directive_fragment

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/glsl/glcpp/glcpp-lex.l