init secondary color to (0,0,0,1). remove some redundant initializations.

[mesa.git] / src / mesa / main / arbparse_syn.h

diff --git a/src/mesa/main/arbparse_syn.h b/src/mesa/main/arbparse_syn.h
index 73ecdc7e66844d9ac1cbfc910bd7b8c0d5349d0a..3d033cd41234d2f0198d25dfc4d58cf6deb658f3 100644 (file)
--- a/src/mesa/main/arbparse_syn.h
+++ b/src/mesa/main/arbparse_syn.h
@@ -849,7 +849,13 @@ static char arb_grammar_text[] = ".syntax program;\n"
 "stateLModProperty_1\n"
 " dot .and \"ambient\" .emit LIGHT_MODEL_AMBIENT;\n"
 "stateLModProperty_2\n"
-" optFaceType .and dot .and \"scenecolor\" .emit LIGHT_MODEL_SCENECOLOR;\n"
+" stateLModProperty_2A .or stateLModProperty_2B .or stateLModProperty_2C;\n"
+"stateLModProperty_2A\n"
+" dot .and \"front\" .and dot .and \"scenecolor\" .emit LIGHT_MODEL_SCENECOLOR .emit FACE_FRONT;\n"
+"stateLModProperty_2B\n"
+" dot .and \"back\" .and dot .and \"scenecolor\" .emit LIGHT_MODEL_SCENECOLOR .emit FACE_BACK;\n"
+"stateLModProperty_2C\n"
+" dot .and \"scenecolor\" .emit LIGHT_MODEL_SCENECOLOR .emit FACE_FRONT;\n"
 "stateLightProdItem\n"
 " \"lightprod\" .and lbracket .and stateLightNumber .and rbracket .and optFaceType .and dot .and\n"
 " stateLProdProperty .error INVALID_LIGHTPROD_PROPERTY;\n"