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

ARB prog: rename POINT, SIZE to POINT_TOK, SIZE_TOK

Browse Source 
Fixes symbol collisions with typedefs in Microsoft headers.
Perhaps we should prefix/suffix all the lexer tokens to avoid this.
This commit is contained in:
Brian Paul
2009-09-04 09:06:40 -06:00
parent 40636fe6f2
commit 3fedd08779
5 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/shader/program_lexer.l
View File

@@ -267,7 +267,7 @@ result { return RESULT; }
{dot}palette { return PALETTE; }
{dot}params { return PARAMS; }
{dot}plane { return PLANE; }
{dot}point { return_token_or_DOT(require_ARB_vp, POINT); }
{dot}point { return_token_or_DOT(require_ARB_vp, POINT_TOK); }
{dot}pointsize { return_token_or_DOT(require_ARB_vp, POINTSIZE); }
{dot}position { return POSITION; }
{dot}primary { return PRIMARY; }
@@ -277,7 +277,7 @@ result { return RESULT; }
{dot}scenecolor { return SCENECOLOR; }
{dot}secondary { return SECONDARY; }
{dot}shininess { return SHININESS; }
{dot}size { return_token_or_DOT(require_ARB_vp, SIZE); }
{dot}size { return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
{dot}specular { return SPECULAR; }
{dot}spot { return SPOT; }
{dot}texcoord { return TEXCOORD; }