From: Brian Paul <brianp@vmware.com>
Date: Sun, 25 Oct 2009 23:20:13 +0000 (-0600)
Subject: mesa: begin removing _mesa_compressed_row_stride() calls
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2594168e9f3cdc4ac53c925486491167837cda30;p=mesa.git

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 40cf43dfff0..b602d920dfa 100644
--- 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 6887521f553..dd146254b4a 100644
--- 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);