summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-11-18 12:04:46 -0700
committerBrian Paul <brianp@vmware.com>2009-11-18 16:52:26 -0700
commiteb051fdca2d902d44c30e62af267f28627131ba6 (patch)
tree3fa03b04d3665a033d9a13eb47868683b30929e7
parent68cc55ab9c264fe18dec2af3f1ef5c274e28a6a9 (diff)
mesa: clean-ups in _mesa_store_compressed_teximage2d()
-rw-r--r--src/mesa/main/texstore.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index fe8d322ba17..7c609899814 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -3487,15 +3487,6 @@ _mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
{
(void) width; (void) height; (void) border;
- /* This is pretty simple, basically just do a memcpy without worrying
- * about the usual image unpacking or image transfer operations.
- */
- ASSERT(texObj);
- ASSERT(texImage);
- ASSERT(texImage->Width > 0);
- ASSERT(texImage->Height > 0);
- ASSERT(texImage->Depth == 1);
-
/* allocate storage */
if (!ctx->Driver.AllocTexImageData(ctx, texImage)) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");
@@ -3506,8 +3497,10 @@ _mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
if (!data)
return;
- /* copy the data */
- MEMCPY(texImage->Map.Data, data, imageSize);
+ /* This is pretty simple, just do a memcpy without worrying
+ * about the usual image unpacking or image transfer operations.
+ */
+ _mesa_memcpy(texImage->Map.Data, data, imageSize);
_mesa_unmap_pbo_source(ctx, &ctx->Unpack);
}