mesa: remove _mesa_compressed_texture_size()

Use _mesa_format_image_size() instead.

diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
index 86f596d..dadc72f 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
+++ b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
@@ -37,7 +37,7 @@ static GLuint radeon_compressed_texture_size(GLcontext *ctx,
                GLsizei width, GLsizei height, GLsizei depth,
                GLuint mesaFormat)
 {
-       GLuint size = _mesa_compressed_texture_size(ctx, width, height, depth, mesaFormat);
+       GLuint size = _mesa_format_image_size(mesaFormat, width, height, depth);
 
        if (mesaFormat == MESA_FORMAT_RGB_DXT1 ||
            mesaFormat == MESA_FORMAT_RGBA_DXT1) {

diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index a820cb8..128c17e 100644 (file)
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -1397,11 +1397,9 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level,
    /* allocate mipmap buffer */
    assert(!texImage->Data);
    if (_mesa_is_format_compressed(texImage->TexFormat)) {
-      texImage->CompressedSize = _mesa_compressed_texture_size(ctx,
-                                                               mml->width,
-                                                               mml->height,
-                                                               1,
-                                                               internalFormat);
+      texImage->CompressedSize = _mesa_format_image_size(texImage->TexFormat,
+                                                         mml->width,
+                                                         mml->height, 1);
       dstRowStride = _mesa_compressed_row_stride(internalFormat, mml->width);
       texImage->Data = _mesa_malloc(texImage->CompressedSize);
    } else {
@@ -1664,11 +1662,9 @@ fxDDCompressedTexImage2D (GLcontext *ctx, GLenum target,
 
    /* allocate new storage for texture image, if needed */
    if (!texImage->Data) {
-      texImage->CompressedSize = _mesa_compressed_texture_size(ctx,
-                                                               mml->width,
-                                                               mml->height,
-                                                               1,
-                                                               internalFormat);
+      texImage->CompressedSize = _mesa_format_image_size(texImage->TexFormat,
+                                                         mml->width,
+                                                         mml->height, 1);
       texImage->Data = _mesa_malloc(texImage->CompressedSize);
       if (!texImage->Data) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2D");

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index b07265d..ad10993 100644 (file)
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -113,30 +113,6 @@ _mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all)
 }
 
 
-
-/**
- * Return number of bytes needed to store a texture of the given size
- * using the specified (compressed?) format.
- * This is called via the ctx->Driver.CompressedTextureSize function,
- * unless a device driver overrides it.  A driver might override this
- * if it needs to use an unusual or padded texture memory layout.
- *
- * \param width texture width in texels.
- * \param height texture height in texels.
- * \param depth texture depth in texels.
- * \param mesaFormat  one of the MESA_FORMAT_* compressed formats
- *
- * \return size in bytes, or zero if bad format
- */
-GLuint
-_mesa_compressed_texture_size( GLcontext *ctx,
-                               GLsizei width, GLsizei height, GLsizei depth,
-                               gl_format mesaFormat )
-{
-   return _mesa_format_image_size(mesaFormat, width, height, depth);
-}
-
-
 /**
  * As above, but format is specified by a GLenum (GL_COMPRESSED_*) token.
  *

diff --git a/src/mesa/main/texcompress.h b/src/mesa/main/texcompress.h
index 13af148..7024709 100644 (file)
--- a/src/mesa/main/texcompress.h
+++ b/src/mesa/main/texcompress.h
@@ -34,11 +34,6 @@ extern GLuint
 _mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all);
 
 extern GLuint
-_mesa_compressed_texture_size( GLcontext *ctx,
-                               GLsizei width, GLsizei height, GLsizei depth,
-                               gl_format mesaFormat );
-
-extern GLuint
 _mesa_compressed_texture_size_glenum(GLcontext *ctx,
                                      GLsizei width, GLsizei height,
                                      GLsizei depth, GLenum glformat);
@@ -64,7 +59,6 @@ _mesa_init_texture_fxt1( GLcontext *ctx );
 
 /* no-op macros */
 #define _mesa_get_compressed_formats( c, f ) 0
-#define _mesa_compressed_texture_size( c, w, h, d, f ) 0
 #define _mesa_compressed_texture_size_glenum( c, w, h, d, f ) 0
 #define _mesa_compressed_row_stride( f, w) 0
 #define _mesa_compressed_image_address(c, r, i, f, w, i2 ) 0

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index d5cd4b2..1f0a3d7 100644 (file)
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -320,12 +320,10 @@ _mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
                               struct gl_texture_object *texObj,
                               struct gl_texture_image *texImage)
 {
-   GLuint size;
-
-   /* don't use texImage->CompressedSize since that may be padded out */
-   size = _mesa_compressed_texture_size(ctx, texImage->Width, texImage->Height,
-                                        texImage->Depth,
-                                        texImage->TexFormat);
+   const GLuint size = _mesa_format_image_size(texImage->TexFormat,
+                                               texImage->Width,
+                                               texImage->Height,
+                                               texImage->Depth);
 
    if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* pack texture image into a PBO */

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index a6b611d..afa66f1 100644 (file)
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -853,12 +853,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
       /* GL_ARB_texture_compression */
       case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
         if (_mesa_is_format_compressed(img->TexFormat) && !isProxy) {
-           /* Don't use ctx->Driver.CompressedTextureSize() since that
-            * may returned a padded hardware size.
-            */
-           *params = _mesa_compressed_texture_size(ctx, img->Width,
-                                                   img->Height, img->Depth,
-                                                   texFormat);
+            *params = _mesa_format_image_size(texFormat, img->Width,
+                                              img->Height, img->Depth);
         }
         else {
            _mesa_error(ctx, GL_INVALID_OPERATION,