OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glcpp: Make undefined macros illegal in #if and #elif for GLES3

Browse Source 
Simply emitting a nicely-formatted error message if any undefined macro is
encountered in a parser context expecting an expression.

With this commit, the following piglit test now passes:

	spec/glsl-es-3.00/compiler/undefined-macro.vert

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Carl Worth
2012-11-26 15:00:05 -08:00
committed by Ian Romanick
parent 77e1bc9f1d
commit 93e719ba4d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glsl/glcpp/glcpp-parse.y
View File

@@ -363,6 +363,8 @@ integer_constant:
expression: expression:
integer_constant integer_constant
| IDENTIFIER { | IDENTIFIER {
if (parser->is_gles)
glcpp_error(& @1, parser, "undefined macro %s in expression (illegal in GLES)", $1);
$$ = 0; $$ = 0;
} }
| expression OR expression { | expression OR expression {