commit 142fcd3a13bcac37b8b0124f68854d515f2596fc
author Roland Scheidegger <sroland@tungstengraphics.com> Thu Mar 13 12:43:04 2008 +0100
committer Roland Scheidegger <sroland@tungstengraphics.com> Thu Mar 13 12:43:04 2008 +0100
tree aad97a7d08b6556a959a2347bb6fcef9eb73d383
parent fcb7cb9e72ecac7c165a3a6ed7a033e2e6793a26

fix state.lightprod ambient/specular w value (bug #14983)

src/mesa/shader/prog_statevars.c

diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index da0bb85..4ae74c1 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -181,7 +181,7 @@
                      ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT+face][i];
                }
                /* [3] = material alpha */
-               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][3];
+               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_AMBIENT+face][3];
                return;
             case STATE_DIFFUSE:
                for (i = 0; i < 3; i++) {
@@ -197,7 +197,7 @@
                      ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SPECULAR+face][i];
                }
                /* [3] = material alpha */
-               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE+face][3];
+               value[3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SPECULAR+face][3];
                return;
             default:
                _mesa_problem(ctx, "Invalid lightprod state in fetch_state");