summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2011-12-03 10:04:18 -0700
committerBrian Paul <[email protected]>2011-12-08 08:56:29 -0700
commit5acb291f319a0b32d9701b3e6c8624175f1a80e7 (patch)
tree7a521f4e19d12f9741c72d15c44afcd6c62f82da /src/mesa/main
parentd9582026631ae3cd667f6cd13040b93e42db3e44 (diff)
mesa: remove TextureMemCpy driver hook
There's probably no reason to use a special version of memcpy() anymore.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/dd.h13
-rw-r--r--src/mesa/main/texstore.c5
2 files changed, 2 insertions, 16 deletions
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 9842540dae0..a068397ef87 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -533,19 +533,6 @@ struct dd_function_table {
struct gl_renderbuffer *rb);
/**
- * Note: no context argument. This function doesn't initially look
- * like it belongs here, except that the driver is the only entity
- * that knows for sure how the texture memory is allocated - via
- * the above callbacks. There is then an argument that the driver
- * knows what memcpy paths might be fast. Typically this is invoked with
- *
- * to -- a pointer into texture memory allocated by NewTextureImage() above.
- * from -- a pointer into client memory or a mesa temporary.
- * sz -- nr bytes to copy.
- */
- void* (*TextureMemCpy)( void *to, const void *from, size_t sz );
-
- /**
* Called by glAreTextureResident().
*/
GLboolean (*IsTextureResident)( struct gl_context *ctx,
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 37fea2156e6..14d24844975 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -954,8 +954,7 @@ memcpy_texture(struct gl_context *ctx,
GLubyte *dstImage = dstSlices[dstZoffset + img]
+ dstYoffset * dstRowStride
+ dstXoffset * texelBytes;
- ctx->Driver.TextureMemCpy(dstImage, srcImage,
- bytesPerRow * srcHeight);
+ memcpy(dstImage, srcImage, bytesPerRow * srcHeight);
srcImage += srcImageStride;
}
}
@@ -968,7 +967,7 @@ memcpy_texture(struct gl_context *ctx,
+ dstYoffset * dstRowStride
+ dstXoffset * texelBytes;
for (row = 0; row < srcHeight; row++) {
- ctx->Driver.TextureMemCpy(dstRow, srcRow, bytesPerRow);
+ memcpy(dstRow, srcRow, bytesPerRow);
dstRow += dstRowStride;
srcRow += srcRowStride;
}