diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-14 19:19:53 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-14 19:19:53 -0600 |
| commit | 5f6a726d9f2274df1a968e5f3cd3862894b47a38 (patch) | |
| tree | 2089b1f68ced49326bf8079aece318212b0a3aa6 | |
| parent | 826218d386a0193f7c6d576b768c4427f09bb109 (diff) | |
fix parsing of state.texenv.color (bug 14931)
cherry-picked from master
| -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 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; /* diff --git a/src/mesa/shader/arbprogram_syn.h b/src/mesa/shader/arbprogram_syn.h index e0c901ea8c..d95a5dede4 100644 --- a/src/mesa/shader/arbprogram_syn.h +++ b/src/mesa/shader/arbprogram_syn.h @@ -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" |