diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
| commit | 0c1cee47049afdcf74d87a23f4f4fd57867f6798 (patch) | |
| tree | 14c117114d1b996e5b04e6546b1580ea53bc26f2 /mesalib/src/mesa/main/texcompress_s3tc.c | |
| parent | 5be921907008288d6465962063bc10fd7a5b1906 (diff) | |
| parent | e6432710d8a586386b3c7025e845cf4f80830da3 (diff) | |
| download | vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.gz vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.bz2 vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/texcompress_s3tc.c')
| -rw-r--r-- | mesalib/src/mesa/main/texcompress_s3tc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c index 2b796dac0..632c05873 100644 --- a/mesalib/src/mesa/main/texcompress_s3tc.c +++ b/mesalib/src/mesa/main/texcompress_s3tc.c @@ -378,7 +378,7 @@ fetch_texel_2d_rgb_dxt1( const struct swrast_texture_image *texImage, (void) k; if (fetch_ext_rgb_dxt1) { fetch_ext_rgb_dxt1(texImage->RowStride, - texImage->Data, i, j, texel); + texImage->Map, i, j, texel); } else _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgb_dxt1"); @@ -406,7 +406,7 @@ fetch_texel_2d_rgba_dxt1( const struct swrast_texture_image *texImage, (void) k; if (fetch_ext_rgba_dxt1) { fetch_ext_rgba_dxt1(texImage->RowStride, - texImage->Data, i, j, texel); + texImage->Map, i, j, texel); } else _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt1\n"); @@ -434,7 +434,7 @@ fetch_texel_2d_rgba_dxt3( const struct swrast_texture_image *texImage, (void) k; if (fetch_ext_rgba_dxt3) { fetch_ext_rgba_dxt3(texImage->RowStride, - texImage->Data, i, j, texel); + texImage->Map, i, j, texel); } else _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt3\n"); @@ -462,7 +462,7 @@ fetch_texel_2d_rgba_dxt5( const struct swrast_texture_image *texImage, (void) k; if (fetch_ext_rgba_dxt5) { fetch_ext_rgba_dxt5(texImage->RowStride, - texImage->Data, i, j, texel); + texImage->Map, i, j, texel); } else _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt5\n"); |