From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 15 Apr 2005 12:57:23 +0000 (+0000)
Subject: Fix alpha value of STATE_LIGHTMODEL_SCENECOLOR.  From the spec:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=78803b2667c1dfe1dc47e09b61a4c29303e09d0b;p=mesa.git

Fix alpha value of STATE_LIGHTMODEL_SCENECOLOR.  From the spec:

 The "w" component of the program parameter variable is filled with
 the alpha component of the front diffuse material color.

Make sure matrix inverses are uptodate also.
---

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 2d398212ebb..e406e1090c5 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -648,20 +648,22 @@ _mesa_fetch_state(GLcontext *ctx, const enum state_index state[],
       if (state[1] == 0) {
          /* front */
          GLint i;
-         for (i = 0; i < 4; i++) {
+         for (i = 0; i < 3; i++) {
             value[i] = ctx->Light.Model.Ambient[i]
                * ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT][i]
                + ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_EMISSION][i];
          }
+	 value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
       }
       else {
          /* back */
          GLint i;
-         for (i = 0; i < 4; i++) {
+         for (i = 0; i < 3; i++) {
             value[i] = ctx->Light.Model.Ambient[i]
                * ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_AMBIENT][i]
                + ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_EMISSION][i];
          }
+	 value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
       }
       return;
    case STATE_LIGHTPROD:
@@ -806,7 +808,9 @@ _mesa_fetch_state(GLcontext *ctx, const enum state_index state[],
          }
          if (modifier == STATE_MATRIX_INVERSE ||
              modifier == STATE_MATRIX_INVTRANS) {
-            /* XXX be sure inverse is up to date */
+            /* Be sure inverse is up to date:
+	     */
+	    _math_matrix_analyse( matrix );
             m = matrix->inv;
          }
          else {