Mesa (master): mesa: remove set-but-unused variables in texcompress_s3tc

Marek Olšák mareko at kemper.freedesktop.org
Sun May 1 12:16:42 UTC 2011


Module: Mesa
Branch: master
Commit: 2032daced10f98d94709e3f36e5276a9286d5297
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2032daced10f98d94709e3f36e5276a9286d5297

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun May  1 13:38:48 2011 +0200

mesa: remove set-but-unused variables in texcompress_s3tc

---

 src/mesa/main/texcompress_s3tc.c |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index 25257ec..86f962e 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -163,7 +163,6 @@ GLboolean
 _mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)
 {
    const GLchan *pixels;
-   GLint srcRowStride;
    GLubyte *dst;
    const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
    const GLchan *tempImage = NULL;
@@ -190,13 +189,10 @@ _mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)
       if (!tempImage)
          return GL_FALSE; /* out of memory */
       pixels = tempImage;
-      srcRowStride = 3 * srcWidth;
       srcFormat = GL_RGB;
    }
    else {
       pixels = (const GLchan *) srcAddr;
-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,
-                                            srcType) / sizeof(GLchan);
    }
 
    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
@@ -226,7 +222,6 @@ GLboolean
 _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)
 {
    const GLchan *pixels;
-   GLint srcRowStride;
    GLubyte *dst;
    const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
    const GLchan *tempImage = NULL;
@@ -253,13 +248,10 @@ _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)
       if (!tempImage)
          return GL_FALSE; /* out of memory */
       pixels = tempImage;
-      srcRowStride = 4 * srcWidth;
       srcFormat = GL_RGBA;
    }
    else {
       pixels = (const GLchan *) srcAddr;
-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,
-                                            srcType) / sizeof(GLchan);
    }
 
    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
@@ -288,7 +280,6 @@ GLboolean
 _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)
 {
    const GLchan *pixels;
-   GLint srcRowStride;
    GLubyte *dst;
    const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
    const GLchan *tempImage = NULL;
@@ -315,12 +306,9 @@ _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)
       if (!tempImage)
          return GL_FALSE; /* out of memory */
       pixels = tempImage;
-      srcRowStride = 4 * srcWidth;
    }
    else {
       pixels = (const GLchan *) srcAddr;
-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,
-                                            srcType) / sizeof(GLchan);
    }
 
    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
@@ -349,7 +337,6 @@ GLboolean
 _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
 {
    const GLchan *pixels;
-   GLint srcRowStride;
    GLubyte *dst;
    const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
    const GLchan *tempImage = NULL;
@@ -376,12 +363,9 @@ _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
       if (!tempImage)
          return GL_FALSE; /* out of memory */
       pixels = tempImage;
-      srcRowStride = 4 * srcWidth;
    }
    else {
       pixels = (const GLchan *) srcAddr;
-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,
-                                            srcType) / sizeof(GLchan);
    }
 
    dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,




More information about the mesa-commit mailing list