diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-02 06:49:56 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-02 06:49:56 +0000 |
| commit | e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61 (patch) | |
| tree | 115901d752ba4f277ef82564bad209082f1feb2e /mesalib/src/mesa/main/texcompress_s3tc.c | |
| parent | e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f (diff) | |
| parent | 34f1ddbb272a5ad55f56d54e2f861da6360db04f (diff) | |
| download | vcxsrv-e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61.tar.gz vcxsrv-e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61.tar.bz2 vcxsrv-e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/texcompress_s3tc.c')
| -rw-r--r-- | mesalib/src/mesa/main/texcompress_s3tc.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c index 479806eca..c7b27c1a4 100644 --- a/mesalib/src/mesa/main/texcompress_s3tc.c +++ b/mesalib/src/mesa/main/texcompress_s3tc.c @@ -167,7 +167,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;
@@ -194,13 +193,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,
@@ -230,7 +226,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;
@@ -257,13 +252,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,
@@ -292,7 +284,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;
@@ -319,12 +310,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,
@@ -353,7 +341,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;
@@ -380,12 +367,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,
|