From 2e6402feb754dd6384ee27fe623a7f9fce66dcaf Mon Sep 17 00:00:00 2001 From: Yuanhan Liu Date: Mon, 21 Nov 2011 16:31:58 +0800 Subject: swrast: fix unmatched span->array->ChanType texture_combine converts the result rgba to CHAN_TYPE from FLOAT. At the same time, make sure the span->array->ChanType is changed, too. v2: pick a nicer comment from Brian Signed-off-by: Yuanhan Liu Reviewed-by: Brian Paul Reviewed-by: Ian Romanick --- src/mesa/swrast/s_texcombine.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/mesa/swrast/s_texcombine.c') diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c index 0686acd1169..1fce5c56562 100644 --- a/src/mesa/swrast/s_texcombine.c +++ b/src/mesa/swrast/s_texcombine.c @@ -545,6 +545,10 @@ texture_combine( struct gl_context *ctx, GLuint unit, UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][BCOMP], rgba[i][BCOMP]); UNCLAMPED_FLOAT_TO_CHAN(rgbaChan[i][ACOMP], rgba[i][ACOMP]); } + /* The span->array->rgba values are of CHAN type so set + * span->array->ChanType field accordingly. + */ + span->array->ChanType = CHAN_TYPE; end: for (i = 0; i < numArgsRGB || i < numArgsA; i++) { -- cgit v1.2.3