mesa: use _mesa_get_texstore_func()
authorBrian Paul <brianp@vmware.com>
Mon, 28 Sep 2009 00:28:22 +0000 (18:28 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 28 Sep 2009 00:28:22 +0000 (18:28 -0600)
src/mesa/main/mipmap.c

index 3dca09d9f289ae39612f90b7cc999d1d2f1ec230..5b70200cd5fa33151bc0fbf0bc69c16093843b63 100644 (file)
@@ -32,6 +32,7 @@
 #include "texcompress.h"
 #include "texformat.h"
 #include "teximage.h"
+#include "texstore.h"
 #include "image.h"
 
 
@@ -1665,16 +1666,21 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
          const GLenum srcFormat = convertFormat->BaseFormat;
          GLint dstRowStride
             = _mesa_compressed_row_stride(dstImage->TexFormat->MesaFormat, dstWidth);
+         const StoreTexImageFunc storeImage =
+            _mesa_get_texstore_func(dstImage->TexFormat->MesaFormat);
+
          ASSERT(srcFormat == GL_RGB || srcFormat == GL_RGBA);
-         dstImage->TexFormat->StoreImage(ctx, 2, dstImage->_BaseFormat,
-                                         dstImage->TexFormat,
-                                         dstImage->Data,
-                                         0, 0, 0, /* dstX/Y/Zoffset */
-                                         dstRowStride, 0, /* strides */
-                                         dstWidth, dstHeight, 1, /* size */
-                                         srcFormat, CHAN_TYPE,
-                                         dstData, /* src data, actually */
-                                         &ctx->DefaultPacking);
+
+         storeImage(ctx, 2, dstImage->_BaseFormat,
+                    dstImage->TexFormat,
+                    dstImage->Data,
+                    0, 0, 0, /* dstX/Y/Zoffset */
+                    dstRowStride, 0, /* strides */
+                    dstWidth, dstHeight, 1, /* size */
+                    srcFormat, CHAN_TYPE,
+                    dstData, /* src data, actually */
+                    &ctx->DefaultPacking);
+
          /* swap src and dest pointers */
          temp = (GLubyte *) srcData;
          srcData = dstData;