diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 87599a65efd..d5b8dbf7e56 100755 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -37,7 +37,6 @@ * However, most device drivers will be able to use the fallback functions * in this file. That is, most drivers will have the following bit of * code: - * ctx->Driver.TexImage = _mesa_store_teximage; * ctx->Driver.TexSubImage = _mesa_store_texsubimage; * etc... * @@ -1105,37 +1104,6 @@ store_texsubimage(struct gl_context *ctx, _mesa_unmap_teximage_pbo(ctx, packing); } - - -/** - * Fallback code for TexImage(). - * Basically, allocate storage for the texture image, then copy the - * user's image into it. - */ -void -_mesa_store_teximage(struct gl_context *ctx, - GLuint dims, - struct gl_texture_image *texImage, - GLenum format, GLenum type, const GLvoid *pixels, - const struct gl_pixelstore_attrib *packing) -{ - assert(dims == 1 || dims == 2 || dims == 3); - - if (_mesa_is_zero_size_texture(texImage)) - return; - - /* allocate storage for texture data */ - if (!st_AllocTextureImageBuffer(ctx, texImage)) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage%uD", dims); - return; - } - - store_texsubimage(ctx, texImage, - 0, 0, 0, texImage->Width, texImage->Height, texImage->Depth, - format, type, pixels, packing, "glTexImage"); -} - - /* * Fallback for Driver.TexSubImage(). */ diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h index 796ff716522..889eb2a5442 100644 --- a/src/mesa/main/texstore.h +++ b/src/mesa/main/texstore.h @@ -110,14 +110,6 @@ _mesa_texstore_can_use_memcpy(struct gl_context *ctx, const struct gl_pixelstore_attrib *srcPacking); -extern void -_mesa_store_teximage(struct gl_context *ctx, - GLuint dims, - struct gl_texture_image *texImage, - GLenum format, GLenum type, const GLvoid *pixels, - const struct gl_pixelstore_attrib *packing); - - extern void _mesa_store_texsubimage(struct gl_context *ctx, GLuint dims, struct gl_texture_image *texImage,