mesa: remove unused _mesa_rescale_teximage2d() function

It was only used by the old tdfx driver, IIRC.

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 1fa49caa41d467fac4473ac3e215b800f238eb00..f04a98b0337fbcfa62706ebcc206f899b31e1ce2 100644 (file)
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -2048,78 +2048,3 @@ _mesa_generate_mipmap(struct gl_context *ctx, GLenum target,
       generate_mipmap_uncompressed(ctx, target, texObj, srcImage, maxLevel);
    }
 }
-
-
-/**
- * Helper function for drivers which need to rescale texture images to
- * certain aspect ratios.
- * Nearest filtering only (for broken hardware that can't support
- * all aspect ratios).  This can be made a lot faster, but I don't
- * really care enough...
- */
-void
-_mesa_rescale_teximage2d(GLuint bytesPerPixel,
-                        GLuint srcStrideInPixels,
-                        GLuint dstRowStride,
-                        GLint srcWidth, GLint srcHeight,
-                        GLint dstWidth, GLint dstHeight,
-                        const GLvoid *srcImage, GLvoid *dstImage)
-{
-   GLint row, col;
-
-#define INNER_LOOP( TYPE, HOP, WOP )                                   \
-   for ( row = 0 ; row < dstHeight ; row++ ) {                         \
-      GLint srcRow = row HOP hScale;                                   \
-      for ( col = 0 ; col < dstWidth ; col++ ) {                       \
-        GLint srcCol = col WOP wScale;                                 \
-        dst[col] = src[srcRow * srcStrideInPixels + srcCol];           \
-      }                                                                        \
-      dst = (TYPE *) ((GLubyte *) dst + dstRowStride);                 \
-   }                                                                   \
-
-#define RESCALE_IMAGE( TYPE )                                          \
-do {                                                                   \
-   const TYPE *src = (const TYPE *)srcImage;                           \
-   TYPE *dst = (TYPE *)dstImage;                                       \
-                                                                       \
-   if ( srcHeight < dstHeight ) {                                      \
-      const GLint hScale = dstHeight / srcHeight;                      \
-      if ( srcWidth < dstWidth ) {                                     \
-        const GLint wScale = dstWidth / srcWidth;                      \
-        INNER_LOOP( TYPE, /, / );                                      \
-      }                                                                        \
-      else {                                                           \
-        const GLint wScale = srcWidth / dstWidth;                      \
-        INNER_LOOP( TYPE, /, * );                                      \
-      }                                                                        \
-   }                                                                   \
-   else {                                                              \
-      const GLint hScale = srcHeight / dstHeight;                      \
-      if ( srcWidth < dstWidth ) {                                     \
-        const GLint wScale = dstWidth / srcWidth;                      \
-        INNER_LOOP( TYPE, *, / );                                      \
-      }                                                                        \
-      else {                                                           \
-        const GLint wScale = srcWidth / dstWidth;                      \
-        INNER_LOOP( TYPE, *, * );                                      \
-      }                                                                        \
-   }                                                                   \
-} while (0)
-
-   switch ( bytesPerPixel ) {
-   case 4:
-      RESCALE_IMAGE( GLuint );
-      break;
-
-   case 2:
-      RESCALE_IMAGE( GLushort );
-      break;
-
-   case 1:
-      RESCALE_IMAGE( GLubyte );
-      break;
-   default:
-      _mesa_problem(NULL,"unexpected bytes/pixel in _mesa_rescale_teximage2d");
-   }
-}
-

diff --git a/src/mesa/main/mipmap.h b/src/mesa/main/mipmap.h
index 8b7cd7d5a4ab82b2f05a6fcc8c0010be5e8306f2..1fb9146a163c9a78b7d996e50d9eaa6afa37a86e 100644 (file)
--- a/src/mesa/main/mipmap.h
+++ b/src/mesa/main/mipmap.h
@@ -46,13 +46,4 @@ _mesa_generate_mipmap(struct gl_context *ctx, GLenum target,
                       struct gl_texture_object *texObj);
 
 
-extern void
-_mesa_rescale_teximage2d(GLuint bytesPerPixel,
-                         GLuint srcStrideInPixels,
-                         GLuint dstRowStride,
-                         GLint srcWidth, GLint srcHeight,
-                         GLint dstWidth, GLint dstHeight,
-                         const GLvoid *srcImage, GLvoid *dstImage);
-
-
 #endif /* MIPMAP_H */