diff options
| author | Brian Paul <brianp@vmware.com> | 2009-10-25 17:20:13 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-10-25 17:20:24 -0600 |
| commit | 2594168e9f3cdc4ac53c925486491167837cda30 (patch) | |
| tree | 501dffd1a1f62ae54231d81d5c5980084e0d0325 /src/mesa/main | |
| parent | 82bcc1c5d27b825db7f002c3c183bd1dc7833438 (diff) | |
mesa: begin removing _mesa_compressed_row_stride() calls
Use equivalent _mesa_format_row_stride() function instead.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/mipmap.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/texstore.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index 40cf43dfff..b602d920df 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 6887521f55..dd146254b4 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); |