diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-25 08:24:51 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-25 08:24:51 +0100 |
| commit | e6432710d8a586386b3c7025e845cf4f80830da3 (patch) | |
| tree | a403fa86779a287c97f5605f9b4d455d662ece66 /mesalib/src/mesa/main/texcompress_fxt1.c | |
| parent | d3f0fe49b8cb29295f3e529cc699a2abde1515a1 (diff) | |
| download | vcxsrv-e6432710d8a586386b3c7025e845cf4f80830da3.tar.gz vcxsrv-e6432710d8a586386b3c7025e845cf4f80830da3.tar.bz2 vcxsrv-e6432710d8a586386b3c7025e845cf4f80830da3.zip | |
mesa git update 25 jan 2012
Diffstat (limited to 'mesalib/src/mesa/main/texcompress_fxt1.c')
| -rw-r--r-- | mesalib/src/mesa/main/texcompress_fxt1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/texcompress_fxt1.c b/mesalib/src/mesa/main/texcompress_fxt1.c index 2480ffb38..eafa18794 100644 --- a/mesalib/src/mesa/main/texcompress_fxt1.c +++ b/mesalib/src/mesa/main/texcompress_fxt1.c @@ -163,7 +163,7 @@ _mesa_fetch_texel_2d_f_rgba_fxt1( const struct swrast_texture_image *texImage, /* just sample as GLubyte and convert to float here */ GLubyte rgba[4]; (void) k; - fxt1_decode_1(texImage->Data, texImage->RowStride, i, j, rgba); + fxt1_decode_1(texImage->Map, texImage->RowStride, i, j, rgba); texel[RCOMP] = UBYTE_TO_FLOAT(rgba[RCOMP]); texel[GCOMP] = UBYTE_TO_FLOAT(rgba[GCOMP]); texel[BCOMP] = UBYTE_TO_FLOAT(rgba[BCOMP]); @@ -178,7 +178,7 @@ _mesa_fetch_texel_2d_f_rgb_fxt1( const struct swrast_texture_image *texImage, /* just sample as GLubyte and convert to float here */ GLubyte rgba[4]; (void) k; - fxt1_decode_1(texImage->Data, texImage->RowStride, i, j, rgba); + fxt1_decode_1(texImage->Map, texImage->RowStride, i, j, rgba); texel[RCOMP] = UBYTE_TO_FLOAT(rgba[RCOMP]); texel[GCOMP] = UBYTE_TO_FLOAT(rgba[GCOMP]); texel[BCOMP] = UBYTE_TO_FLOAT(rgba[BCOMP]); |