3 files changed, 9 insertions, 41 deletions

diff --git a/src/mesa/drivers/dri/radeon/radeon_tex_getimage.c b/src/mesa/drivers/dri/radeon/radeon_tex_getimage.c
index 6e9772e2f1a..a72c2da971f 100644
--- a/src/mesa/drivers/dri/radeon/radeon_tex_getimage.c
+++ b/src/mesa/drivers/dri/radeon/radeon_tex_getimage.c
@@ -39,17 +39,17 @@
  * Need to map texture image into memory before copying image data,
  * then unmap it.
  */
-static void
-radeon_get_tex_image(struct gl_context * ctx, GLenum target, GLint level,
-             GLenum format, GLenum type, GLvoid * pixels,
-             struct gl_texture_object *texObj,
-             struct gl_texture_image *texImage, int compressed)
+void
+radeonGetTexImage(struct gl_context * ctx, GLenum target, GLint level,
+          GLenum format, GLenum type, GLvoid * pixels,
+          struct gl_texture_object *texObj,
+          struct gl_texture_image *texImage)
 {
     radeon_texture_image *image = get_radeon_texture_image(texImage);
 
     radeon_print(RADEON_TEXTURE, RADEON_NORMAL,
-                 "%s(%p, tex %p, image %p) compressed %d.\n",
-                 __func__, ctx, texObj, image, compressed);
+                 "%s(%p, tex %p, image %p).\n",
+                 __func__, ctx, texObj, image);
 
     if (image->mt) {
         radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
@@ -67,37 +67,10 @@ radeon_get_tex_image(struct gl_context * ctx, GLenum target, GLint level,
         assert(image->base.Base.Data);
     }
 
-    if (compressed) {
-        /* FIXME: this can't work for small textures (mips) which
-                 use different hw stride */
-        _mesa_get_compressed_teximage(ctx, target, level, pixels,
-                          texObj, texImage);
-    } else {
-        _mesa_get_teximage(ctx, target, level, format, type, pixels,
-                   texObj, texImage);
-    }
+    _mesa_get_teximage(ctx, target, level, format, type, pixels,
+		       texObj, texImage);
 
     if (image->mt) {
         radeon_teximage_unmap(image);
     }
 }
-
-void
-radeonGetTexImage(struct gl_context * ctx, GLenum target, GLint level,
-          GLenum format, GLenum type, GLvoid * pixels,
-          struct gl_texture_object *texObj,
-          struct gl_texture_image *texImage)
-{
-    radeon_get_tex_image(ctx, target, level, format, type, pixels,
-                 texObj, texImage, 0);
-}
-
-void
-radeonGetCompressedTexImage(struct gl_context *ctx, GLenum target, GLint level,
-                GLvoid *pixels,
-                struct gl_texture_object *texObj,
-                struct gl_texture_image *texImage)
-{
-    radeon_get_tex_image(ctx, target, level, 0, 0, pixels,
-                 texObj, texImage, 1);
-}
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index bb276299497..d7636ca7289 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -1191,7 +1191,6 @@ radeon_init_common_texture_funcs(radeonContextPtr radeon,
 	functions->TexSubImage3D = radeonTexSubImage3D;
 	functions->CompressedTexImage2D = radeonCompressedTexImage2D;
 	functions->CompressedTexSubImage2D = radeonCompressedTexSubImage2D;
-	functions->GetCompressedTexImage = radeonGetCompressedTexImage;
 	functions->GetTexImage = radeonGetTexImage;
 
 	functions->GenerateMipmap = radeonGenerateMipmap;
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.h b/src/mesa/drivers/dri/radeon/radeon_texture.h
index c02aa30c789..3d096b1b1e4 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.h
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.h
@@ -121,10 +121,6 @@ void radeonGetTexImage(struct gl_context * ctx, GLenum target, GLint level,
 		       GLenum format, GLenum type, GLvoid * pixels,
 		       struct gl_texture_object *texObj,
 		       struct gl_texture_image *texImage);
-void radeonGetCompressedTexImage(struct gl_context *ctx, GLenum target, GLint level,
-				 GLvoid *pixels,
-				 struct gl_texture_object *texObj,
-				 struct gl_texture_image *texImage);
 
 void radeonCopyTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,
 			GLint xoffset, GLint yoffset,