From 8aaf805b8afbde3b9faa681f29f691bec3213f4a Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 10 Mar 2008 07:41:31 -0600
Subject: [PATCH] fix parsing of state.texenv.color (bug 14931)

---
 docs/relnotes-7.0.3.html         | 1 +
 src/mesa/shader/arbprogram.syn   | 4 ++--
 src/mesa/shader/arbprogram_syn.h | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/relnotes-7.0.3.html b/docs/relnotes-7.0.3.html
index c1b7b5ec377..a2a3437442e 100644
--- a/docs/relnotes-7.0.3.html
+++ b/docs/relnotes-7.0.3.html
@@ -39,6 +39,7 @@ Mesa 7.0.3 is a stable release with bug fixes since version 7.0.2.
 <li>Fixed potential crash in glDrawPixels(GL_DEPTH_COMPONENT) (bug 13915)
 <li>Bad strings given to glProgramStringARB() didn't generate GL_INVALID_OPERATION
 <li>Fixed minor point rasterization regression (bug 11016)
+<li>state.texenv.color state var didn't work in GL_ARB_fragment_program (bug 14931)
 </ul>
 
 
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"