diff options
| author | Brian Paul <brianp@vmware.com> | 2011-10-04 18:26:39 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-10-05 21:06:47 -0600 |
| commit | 5253cf98057dad54e25b4b8c36f8cf24f559314c (patch) | |
| tree | e3eae8ee98685f9a1795e3d301680e96871d651a /src/mesa/main/texcompress_fxt1.c | |
| parent | c3ef232315a4e9c18b3d812dbb28ffac6830d6f8 (diff) | |
| download | external_mesa3d-5253cf98057dad54e25b4b8c36f8cf24f559314c.zip external_mesa3d-5253cf98057dad54e25b4b8c36f8cf24f559314c.tar.gz external_mesa3d-5253cf98057dad54e25b4b8c36f8cf24f559314c.tar.bz2 | |
mesa: get rid of imageOffsets arrays in texstore code
These were used to find the start of a 3D image slice (or 2D array texture
slice) given a base address. Instead, use a simple array of address of
image slices instead.
This is a step toward getting rid of the gl_texture_image::ImageOffsets
field.
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/main/texcompress_fxt1.c')
| -rw-r--r-- | src/mesa/main/texcompress_fxt1.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c index 0437cfc..b6d8ae0 100644 --- a/src/mesa/main/texcompress_fxt1.c +++ b/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); |