fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 15:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swrast: fix RGB, RGBA texturing code

Browse source 
Fix backward component ordering for RGB textures.
Only optimize RGBA texture case if running little endian.  This restriction
could be lifted with a little work.
This commit is contained in:
Brian Paul 2009-10-28 19:46:26 -06:00
parent 88bb4b5935
commit 086f9fc0e2
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/swrast/s_triangle.c
View file

@ -159,9 +159,9 @@ _swrast_culltriangle( GLcontext *ctx,
GLint t = FixedToInt(span.intTex[1]) & tmask; \
GLint pos = (t << twidth_log2) + s; \
pos = pos + pos + pos; /* multiply by 3 */ \
rgb[i][RCOMP] = texture[pos]; \
rgb[i][RCOMP] = texture[pos+2]; \
rgb[i][GCOMP] = texture[pos+1]; \
rgb[i][BCOMP] = texture[pos+2]; \
rgb[i][BCOMP] = texture[pos+0]; \
span.intTex[0] += span.intTexStep[0]; \
span.intTex[1] += span.intTexStep[1]; \
} \
@ -215,9 +215,9 @@ _swrast_culltriangle( GLcontext *ctx,
GLint t = FixedToInt(span.intTex[1]) & tmask; \
GLint pos = (t << twidth_log2) + s; \
pos = pos + pos + pos; /* multiply by 3 */ \
rgb[i][RCOMP] = texture[pos]; \
rgb[i][RCOMP] = texture[pos+2]; \
rgb[i][GCOMP] = texture[pos+1]; \
rgb[i][BCOMP] = texture[pos+2]; \
rgb[i][BCOMP] = texture[pos+0]; \
zRow[i] = z; \
span.array->mask[i] = 1; \
} \
@ -1101,7 +1101,13 @@ _swrast_choose_triangle( GLcontext *ctx )
#if CHAN_BITS != 8
USE(general_triangle);
#else
USE(affine_textured_triangle);
if (format == MESA_FORMAT_RGBA8888 && !_mesa_little_endian())
/* We only handle RGBA8888 correctly on little endian
* in the optimized code above.
*/
USE(general_triangle);
else
USE(affine_textured_triangle);
#endif
}
}