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

This commit is contained in:
Brian 2008-03-10 07:41:31 -06:00
parent 8161fd2785
commit 8aaf805b8a
3 changed files with 5 additions and 2 deletions

View file

@ -39,6 +39,7 @@ Mesa 7.0.3 is a stable release with bug fixes since version 7.0.2.
<li>Fixed potential crash in glDrawPixels(GL_DEPTH_COMPONENT) (bug 13915)
<li>Bad strings given to glProgramStringARB() didn't generate GL_INVALID_OPERATION
<li>Fixed minor point rasterization regression (bug 11016)
<li>state.texenv.color state var didn't work in GL_ARB_fragment_program (bug 14931)
</ul>

View file

@ -1904,10 +1904,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;
/*

View file

@ -905,6 +905,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"