diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/dd.h | 13 | ||||
| -rw-r--r-- | src/mesa/main/texstore.c | 5 |
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; } |