diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-01 16:56:41 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-01 16:56:41 +0200 |
| commit | ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4 (patch) | |
| tree | a961f21249024edee920dc41bb54b2507cf08696 /mesalib/src/mesa/swrast_setup | |
| parent | 03418d6378fe72bea2ff4b941792054dd208b65d (diff) | |
| download | vcxsrv-ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4.tar.gz vcxsrv-ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4.tar.bz2 vcxsrv-ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4.zip | |
xkeyboard-config libxcb xserver mesa git update 1 May 2014
xserver commit 2535b76c0d32bc1dd0ddaca06a419a68a4757df1
libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8
xkeyboard-config commit 5274a69ee85fb6c425c33c631fa8ea1310a8f097
mesa commit a773fdc64da8ba88d8c7f8e383c45248b0c3aa19
Diffstat (limited to 'mesalib/src/mesa/swrast_setup')
| -rw-r--r-- | mesalib/src/mesa/swrast_setup/ss_context.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast_setup/ss_context.c b/mesalib/src/mesa/swrast_setup/ss_context.c index 12a47358f..0b3b9e4df 100644 --- a/mesalib/src/mesa/swrast_setup/ss_context.c +++ b/mesalib/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]); |