diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-08 21:42:21 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-08 21:42:21 +0000 |
| commit | ee97a3165b1f07f011cf95804590925b81e8ec96 (patch) | |
| tree | 58aa78664ad871145a5a0149f9ad60f140f934aa /mesalib/src/mesa/main/texfetch_tmp.h | |
| parent | c8a34ce9318446bcd8e91e601525a61d6847f28f (diff) | |
| parent | 432768f75da13ee5343957df6ce5cd316a62929f (diff) | |
| download | vcxsrv-ee97a3165b1f07f011cf95804590925b81e8ec96.tar.gz vcxsrv-ee97a3165b1f07f011cf95804590925b81e8ec96.tar.bz2 vcxsrv-ee97a3165b1f07f011cf95804590925b81e8ec96.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/texfetch_tmp.h')
| -rw-r--r-- | mesalib/src/mesa/main/texfetch_tmp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/texfetch_tmp.h b/mesalib/src/mesa/main/texfetch_tmp.h index 40f56209f..9c2b36a02 100644 --- a/mesalib/src/mesa/main/texfetch_tmp.h +++ b/mesalib/src/mesa/main/texfetch_tmp.h @@ -837,7 +837,7 @@ static void store_texel_argb2101010(struct gl_texture_image *texImage, {
const GLubyte *rgba = (const GLubyte *) texel;
GLuint *dst = TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
- *dst = PACK_COLOR_2101010(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
+ *dst = PACK_COLOR_2101010_UB(rgba[ACOMP], rgba[RCOMP], rgba[GCOMP], rgba[BCOMP]);
}
#endif
@@ -899,8 +899,8 @@ static void FETCH(f_al44)( const struct gl_texture_image *texImage, const GLubyte s = *TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
texel[RCOMP] =
texel[GCOMP] =
- texel[BCOMP] = UBYTE_TO_FLOAT( (s & 0x0f) << 4 );
- texel[ACOMP] = UBYTE_TO_FLOAT( s & 0xf0 );
+ texel[BCOMP] = (s & 0xf) * (1.0F / 15.0F);
+ texel[ACOMP] = ((s >> 4) & 0xf) * (1.0F / 15.0F);
}
#if DIM == 3
|