diff options
| author | Zack Rusin <zack@tungstengraphics.com> | 2008-05-19 12:10:42 -0400 |
|---|---|---|
| committer | Zack Rusin <zack@tungstengraphics.com> | 2008-05-19 12:10:42 -0400 |
| commit | 09900df42967a0ba61e78038304fd6c54934ad0d (patch) | |
| tree | 8bf72aa313a23c8554fdda5c9381cc593132722d /src/mesa/shader/arbprogram.syn | |
| parent | 1c624846a81b0218b4a07328f485e295432c6312 (diff) | |
| parent | 59007a811de2d76ea00164e8f1cacb4a375d1458 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-vertex-linear
Diffstat (limited to 'src/mesa/shader/arbprogram.syn')
| -rw-r--r-- | src/mesa/shader/arbprogram.syn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/arbprogram.syn b/src/mesa/shader/arbprogram.syn index ba17d638a3..b12c6a0eda 100644 --- a/src/mesa/shader/arbprogram.syn +++ b/src/mesa/shader/arbprogram.syn @@ -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; /* |