diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-18 16:17:50 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-18 16:17:50 -0600 |
| commit | 54fbd8bbd4e5a484d59907bae852908e3a8b8f3c (patch) | |
| tree | 2e45fac3c2505fe1131ed38e45110e1319f49806 /src/mesa/shader/arbprogram.syn | |
| parent | b4219e35e2de783ca03e53c311a8a56f8b633aa1 (diff) | |
| parent | a0bfeb0c3ca58a1f4d978f2aaa343ed4009de079 (diff) | |
Merge branch 'gallium-0.1' into gallium-tex-surfaces
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; /* |