AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: fix unpacking of RG88_REV texels

Browse Source 
R should be in the high byte and G in the low byte for this format.
This commit is contained in:
Brian Paul
2011-11-30 20:35:02 -07:00
parent e304aa3600
commit 0be753a143
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/format_unpack.c
+2 -2
View File
@@ -522,8 +522,8 @@ unpack_RG88_REV(const void *src, GLfloat dst[][4], GLuint n)
const GLushort *s = ((const GLushort *) src);
GLuint i;
for (i = 0; i < n; i++) {
dst[i][RCOMP] = UBYTE_TO_FLOAT( s[i] & 0xff );
dst[i][GCOMP] = UBYTE_TO_FLOAT( s[i] >> 8 );
dst[i][RCOMP] = UBYTE_TO_FLOAT( s[i] >> 8 );
dst[i][GCOMP] = UBYTE_TO_FLOAT( s[i] & 0xff );
dst[i][BCOMP] = 0.0;
dst[i][ACOMP] = 1.0;
}
src/mesa/swrast/s_texfetch_tmp.h
+3 -3
View File
@@ -1040,8 +1040,8 @@ static void FETCH(f_rg88_rev)( const struct swrast_texture_image *texImage,
GLint i, GLint j, GLint k, GLfloat *texel )
{
const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
texel[RCOMP] = UBYTE_TO_FLOAT( s & 0xff );
texel[GCOMP] = UBYTE_TO_FLOAT( s >> 8 );
texel[RCOMP] = UBYTE_TO_FLOAT( s >> 8 );
texel[GCOMP] = UBYTE_TO_FLOAT( s & 0xff );
texel[BCOMP] = 0.0;
texel[ACOMP] = 1.0;
}
@@ -1052,7 +1052,7 @@ static void store_texel_rg88_rev(struct swrast_texture_image *texImage,
{
const GLubyte *rgba = (const GLubyte *) texel;
GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
*dst = PACK_COLOR_88(rgba[GCOMP], rgba[RCOMP]);
*dst = PACK_COLOR_88(rgba[RCOMP], rgba[GCOMP]);
}
#endif