diff options
| author | Yuanhan Liu <[email protected]> | 2011-11-21 16:31:58 +0800 |
|---|---|---|
| committer | Yuanhan Liu <[email protected]> | 2011-11-21 16:32:39 +0800 |
| commit | 2e6402feb754dd6384ee27fe623a7f9fce66dcaf (patch) | |
| tree | f3ffd33ca0f4d46ed43c97181fa9d0fb4db13be5 /src/mesa/swrast/s_texcombine.c | |
| parent | 6ba8f0688a35ffac93bd025739aefe8e3694ca0c (diff) | |
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 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/swrast/s_texcombine.c')
| -rw-r--r-- | src/mesa/swrast/s_texcombine.c | 4 |
1 files changed, 4 insertions, 0 deletions
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++) { |