Mesa (10.1): swrast: Fix vertex color in _swsetup_Translate()

[Carl Worth]

Module: Mesa
Branch: 10.1
Commit: 468c1a2d46c3bf37a4d57eb0adc4eccbd88d1d86
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=468c1a2d46c3bf37a4d57eb0adc4eccbd88d1d86

Author: nick <nick at fuel7.com>
Date:   Wed Apr 23 08:18:00 2014 -0600

swrast: Fix vertex color in _swsetup_Translate()

Straightforward fix to properly load dest->color with color data, as
opposed to position data as previously implemented.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27499
Cc: "10.1" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 15c92464df07c5c0bb23a007358c560faeab76a8)

---

 src/mesa/swrast_setup/ss_context.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/swrast_setup/ss_context.c b/src/mesa/swrast_setup/ss_context.c
index 12a4735..0b3b9e4 100644
--- a/src/mesa/swrast_setup/ss_context.c
+++ b/src/mesa/swrast_setup/ss_context.c
@@ -287,7 +287,8 @@ _swsetup_Translate( struct gl_context *ctx, const void *vertex, SWvertex *dest )
 
    _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_COLOR0,
                   dest->attrib[VARYING_SLOT_COL0] );
-   UNCLAMPED_FLOAT_TO_RGBA_CHAN( dest->color, tmp );
+
+   UNCLAMPED_FLOAT_TO_RGBA_CHAN(dest->color, dest->attrib[VARYING_SLOT_COL0]);
 
    _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_COLOR1,
                   dest->attrib[VARYING_SLOT_COL1]);