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

8
src/mesa/shader/program_parse.y
View File

@@ -159,9 +159,9 @@ static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,
%token MATERIAL MAT_PROGRAM MATRIX MATRIXINDEX MODELVIEW MVP
%token NORMAL
%token OBJECT
%token PALETTE PARAMS PLANE POINT POINTSIZE POSITION PRIMARY PROGRAM PROJECTION
%token PALETTE PARAMS PLANE POINT_TOK POINTSIZE POSITION PRIMARY PROGRAM PROJECTION
%token RANGE RESULT ROW
%token SCENECOLOR SECONDARY SHININESS SIZE SPECULAR SPOT STATE
%token SCENECOLOR SECONDARY SHININESS SIZE_TOK SPECULAR SPOT STATE
%token TEXCOORD TEXENV TEXGEN TEXGEN_Q TEXGEN_R TEXGEN_S TEXGEN_T TEXTURE TRANSPOSE
%token TEXTURE_UNIT TEX_1D TEX_2D TEX_3D TEX_CUBE TEX_RECT
%token TEX_SHADOW1D TEX_SHADOW2D TEX_SHADOWRECT
@@ -1353,14 +1353,14 @@ stateClipPlaneNum: INTEGER
}
;
statePointItem: POINT statePointProperty
statePointItem: POINT_TOK statePointProperty
{
memset($$, 0, sizeof($$));
$$[0] = $2;
}
;
statePointProperty: SIZE
statePointProperty: SIZE_TOK
{
$$ = STATE_POINT_SIZE;
}