diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-01 17:03:50 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-01 17:03:50 +0200 |
| commit | aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa (patch) | |
| tree | 37bc7921f864ead4f6eb357b31a1eb66d46aaef9 /mesalib/src/mesa/swrast_setup | |
| parent | 2e0adb33e03e3142f1412ed570415c5ce616dcef (diff) | |
| parent | ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4 (diff) | |
| download | vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.gz vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.bz2 vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_util.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
xorg-server/os/utils.c
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]); |