mesa: begin removing _mesa_compressed_row_stride() calls

Use equivalent _mesa_format_row_stride() function instead.

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 40cf43dfff0ab418fdc6b73abfcf4f6783cb797d..b602d920dfad11f75cc4cd7ab5ec5d542a384969 100644 (file)
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1661,7 +1661,7 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
          /* compress image from dstData into dstImage->Data */
          const GLenum srcFormat = _mesa_get_format_base_format(convertFormat);
          GLint dstRowStride
-            = _mesa_compressed_row_stride(dstImage->TexFormat, dstWidth);
+            = _mesa_format_row_stride(dstImage->TexFormat, dstWidth);
          ASSERT(srcFormat == GL_RGB || srcFormat == GL_RGBA);
 
          _mesa_texstore(ctx, 2, dstImage->_BaseFormat,

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 6887521f553d9a06e5a3c5d4cacd7fbbd50edc61..dd146254b4a84bf188d8848e1142110e13a3a005 100644 (file)
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -3682,10 +3682,10 @@ _mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target,
    if (!data)
       return;
 
-   srcRowStride = _mesa_compressed_row_stride(texFormat, width);
+   srcRowStride = _mesa_format_row_stride(texFormat, width);
    src = (const GLubyte *) data;
 
-   destRowStride = _mesa_compressed_row_stride(texFormat, destWidth);
+   destRowStride = _mesa_format_row_stride(texFormat, destWidth);
    dest = _mesa_compressed_image_address(xoffset, yoffset, 0,
                                          texFormat, destWidth,
                                          (GLubyte *) texImage->Data);