fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
Show stats 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
<optLegacyTexUnitNum> ::= ""
| "[" <legacyTexUnitNum> "]"
NOTE: <optLegaceTexUnitNum> is not optional.
*/
optLegacyTexUnitNum
optLegacyTexUnitNum_1 .or .true .emit 0x00;
optLegacyTexUnitNum_1
lbracket_ne .and legacyTexUnitNum .and rbracket;
/*

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

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