On 04/23/2014 08:18 AM, ville.syrj...@linux.intel.com wrote:
From: nick <n...@fuel7.com>Straightforward fix to properly load dest->color with color data, as opposed to position data as previously implemented. [vsyrjala: I noticed the patch languishing in bugzilla. It looks correct to me so I refreshed it for master. Looks like it's a regression introduced in: commit a164d3aee063580503e5e9a77980059d52c486d7 Author: Brian <brian.p...@tungstengraphics.com> Date: Fri Jul 6 16:51:19 2007 -0600 In _swsetup_Translate(), update dest->attrib[FRAG_ATTRIB_COL0].] Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27499 Cc: Brian Paul <bri...@vmware.com> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com> --- 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..237f74c 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]);
Reviewed-by: Brian Paul <bri...@vmware.com> Do you need someone to commit this for you? Tag for stable branches? _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
