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

fix parsing of state.texenv.color (bug 14931)

Browse Source 
cherry-picked from master
This commit is contained in:
Brian Paul
2008-05-14 19:19:53 -06:00
parent 826218d386
commit 5f6a726d9f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/shader/arbprogram.syn
View File

@@ -1942,10 +1942,10 @@ stateTexEnvProperty
fragment program fragment program
<optLegacyTexUnitNum> ::= "" <optLegacyTexUnitNum> ::= ""
| "[" <legacyTexUnitNum> "]" | "[" <legacyTexUnitNum> "]"
NOTE: <optLegaceTexUnitNum> is not optional.
*/ */
optLegacyTexUnitNum optLegacyTexUnitNum
optLegacyTexUnitNum_1 .or .true .emit 0x00;
optLegacyTexUnitNum_1
lbracket_ne .and legacyTexUnitNum .and rbracket; lbracket_ne .and legacyTexUnitNum .and rbracket;
/* /*

2
src/mesa/shader/arbprogram_syn.h
View File

@@ -926,6 +926,8 @@
"stateTexEnvProperty\n" "stateTexEnvProperty\n"
" \"color\" .emit TEX_ENV_COLOR;\n" " \"color\" .emit TEX_ENV_COLOR;\n"
"optLegacyTexUnitNum\n" "optLegacyTexUnitNum\n"
" optLegacyTexUnitNum_1 .or .true .emit 0x00;\n"
"optLegacyTexUnitNum_1\n"
" lbracket_ne .and legacyTexUnitNum .and rbracket;\n" " lbracket_ne .and legacyTexUnitNum .and rbracket;\n"
"legacyTexUnitNum\n" "legacyTexUnitNum\n"
" integer;\n" " integer;\n"