diff options
| author | Brian <[email protected]> | 2008-03-10 07:41:53 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2008-03-10 07:43:40 -0600 |
| commit | dd0a9203e3c71286836f7600e99ee826ebce7a06 (patch) | |
| tree | a03c312c0c64b4f2343d5f3b84254f05655496da | |
| parent | 20e0a8a1ca8e526f4b9b5e6043456c5aeb8fbc0f (diff) | |
fix parsing of state.texenv.color (bug 14931)
| -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 1746a876c30..f3aa1ad7249 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 5f3f7d6cf46..3f3ab073cf9 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" |