Merge branch 'mesa_7_5_branch'

[mesa.git] / src / mesa / shader / arbprogram.syn

diff --git a/src/mesa/shader/arbprogram.syn b/src/mesa/shader/arbprogram.syn
index ba17d638a3ab88f641c92ebe9b4cc840e00399a9..b12c6a0eda532c22d1faaae28b3a100319ca1672 100644 (file)
--- 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;
 
 /*