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

Replace gl_vert_result enum with gl_varying_slot.

Browse Source 
This patch makes the following search-and-replace changes:

gl_vert_result -> gl_varying_slot
VERT_RESULT_* -> VARYING_SLOT_*

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Paul Berry
2013-02-23 07:22:01 -08:00
parent 9e729a79b0
commit 36b252e947
45 changed files with 358 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mesa/program/program_parse.y
View File

@@ -643,7 +643,7 @@ maskedDstReg: dstReg optionalMask optionalCcMask
* set in fragment program mode, so it is somewhat irrelevant.
*/
if (state->option.PositionInvariant
&& ($$.Index == VERT_RESULT_HPOS)) {
&& ($$.Index == VARYING_SLOT_POS)) {
yyerror(& @1, state, "position-invariant programs cannot "
"write position");
YYERROR;
@@ -2005,7 +2005,7 @@ OUTPUT_statement: optVarSize OUTPUT IDENTIFIER '=' resultBinding
resultBinding: RESULT POSITION
{
if (state->mode == ARB_vertex) {
$$ = VERT_RESULT_HPOS;
$$ = VARYING_SLOT_POS;
} else {
yyerror(& @2, state, "invalid program result name");
YYERROR;
@@ -2014,7 +2014,7 @@ resultBinding: RESULT POSITION
| RESULT FOGCOORD
{
if (state->mode == ARB_vertex) {
$$ = VERT_RESULT_FOGC;
$$ = VARYING_SLOT_FOGC;
} else {
yyerror(& @2, state, "invalid program result name");
YYERROR;
@@ -2027,7 +2027,7 @@ resultBinding: RESULT POSITION
| RESULT POINTSIZE
{
if (state->mode == ARB_vertex) {
$$ = VERT_RESULT_PSIZ;
$$ = VARYING_SLOT_PSIZ;
} else {
yyerror(& @2, state, "invalid program result name");
YYERROR;
@@ -2036,7 +2036,7 @@ resultBinding: RESULT POSITION
| RESULT TEXCOORD optTexCoordUnitNum
{
if (state->mode == ARB_vertex) {
$$ = VERT_RESULT_TEX0 + $3;
$$ = VARYING_SLOT_TEX0 + $3;
} else {
yyerror(& @2, state, "invalid program result name");
YYERROR;
@@ -2062,7 +2062,7 @@ resultColBinding: COLOR optResultFaceType optResultColorType
optResultFaceType:
{
if (state->mode == ARB_vertex) {
$$ = VERT_RESULT_COL0;
$$ = VARYING_SLOT_COL0;
} else {
if (state->option.DrawBuffers)
$$ = FRAG_RESULT_DATA0;
@@ -2101,7 +2101,7 @@ optResultFaceType:
| FRONT
{
if (state->mode == ARB_vertex) {
$$ = VERT_RESULT_COL0;
$$ = VARYING_SLOT_COL0;
} else {
yyerror(& @1, state, "invalid program result name");
YYERROR;
@@ -2110,7 +2110,7 @@ optResultFaceType:
| BACK
{
if (state->mode == ARB_vertex) {
$$ = VERT_RESULT_BFC0;
$$ = VARYING_SLOT_BFC0;
} else {
yyerror(& @1, state, "invalid program result name");
YYERROR;