diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2008-03-10 07:41:31 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2008-03-10 07:41:31 -0600 |
| commit | 8aaf805b8afbde3b9faa681f29f691bec3213f4a (patch) | |
| tree | adb8be7fe0bf8b8081a75500cfeb94dda473e689 /src | |
| parent | 8161fd278551eff3465205ca6bf8ec461d265156 (diff) | |
fix parsing of state.texenv.color (bug 14931)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/shader/arbprogram.syn | 4 | ||||
| -rw-r--r-- | src/mesa/shader/arbprogram_syn.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/shader/arbprogram.syn b/src/mesa/shader/arbprogram.syn index 6ab0f269380..2aa5551cf77 100644 --- a/src/mesa/shader/arbprogram.syn +++ b/src/mesa/shader/arbprogram.syn @@ -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; /* diff --git a/src/mesa/shader/arbprogram_syn.h b/src/mesa/shader/arbprogram_syn.h index c67afc67db9..3904870a09e 100644 --- a/src/mesa/shader/arbprogram_syn.h +++ b/src/mesa/shader/arbprogram_syn.h @@ -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" |