diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-06 08:50:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-06 08:50:17 +0200 |
| commit | 543c5ecf97b067fe5e0824f996c227e30ee693b0 (patch) | |
| tree | 7207e6216bd20423b473153e10d1975ca17700fd /mesalib/src/mesa/main/texcompress_fxt1.c | |
| parent | a411d3abb8352c0f65fd4f045d825c0b023dadf4 (diff) | |
| parent | b520df571e0a319eae5231d09f36b98f28b8914a (diff) | |
| download | vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.tar.gz vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.tar.bz2 vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/texcompress_fxt1.c')
| -rw-r--r-- | mesalib/src/mesa/main/texcompress_fxt1.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/texcompress_fxt1.c b/mesalib/src/mesa/main/texcompress_fxt1.c index 0437cfcc1..b6d8ae016 100644 --- a/mesalib/src/mesa/main/texcompress_fxt1.c +++ b/mesalib/src/mesa/main/texcompress_fxt1.c @@ -72,7 +72,6 @@ _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS) ASSERT(dstYoffset % 4 == 0); ASSERT(dstZoffset == 0); (void) dstZoffset; - (void) dstImageOffsets; if (srcFormat != GL_RGB || srcType != GL_UNSIGNED_BYTE || @@ -99,7 +98,7 @@ _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS) dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0, dstFormat, - texWidth, (GLubyte *) dstAddr); + texWidth, dstSlices[0]); fxt1_encode(srcWidth, srcHeight, 3, pixels, srcRowStride, dst, dstRowStride); @@ -128,7 +127,6 @@ _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS) ASSERT(dstYoffset % 4 == 0); ASSERT(dstZoffset == 0); (void) dstZoffset; - (void) dstImageOffsets; if (srcFormat != GL_RGBA || srcType != GL_UNSIGNED_BYTE || @@ -155,7 +153,7 @@ _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS) dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0, dstFormat, - texWidth, (GLubyte *) dstAddr); + texWidth, dstSlices[0]); fxt1_encode(srcWidth, srcHeight, 4, pixels, srcRowStride, dst, dstRowStride); |