From 8cd728f43639f0f0a1f9ad22ea00821b0ccd2b80 Mon Sep 17 00:00:00 2001 From: Daniel Borca Date: Mon, 18 Oct 2004 07:54:09 +0000 Subject: [PATCH] added dstRowStride to dxtCompressTexFuncExt; good for subimages, padded images and such. NB: intentionally, this is the last parameter, to avoid breaking the current API! adding a new parameter is not harmful, at worst it will be ignored, since all platforms use a CDECL calling convention. --- src/mesa/main/texcompress_s3tc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c index 69e6335ec12..44ab9e2acad 100644 --- a/src/mesa/main/texcompress_s3tc.c +++ b/src/mesa/main/texcompress_s3tc.c @@ -69,7 +69,7 @@ dxtFetchTexelFuncExt fetch_ext_rgba_dxt1 = NULL; dxtFetchTexelFuncExt fetch_ext_rgba_dxt3 = NULL; dxtFetchTexelFuncExt fetch_ext_rgba_dxt5 = NULL; -typedef void (*dxtCompressTexFuncExt)(GLint srccomps, GLint width, GLint height, const GLubyte *srcPixData, GLenum destformat, GLubyte *dest); +typedef void (*dxtCompressTexFuncExt)(GLint srccomps, GLint width, GLint height, const GLubyte *srcPixData, GLenum destformat, GLubyte *dest, GLint dstRowStride); dxtCompressTexFuncExt ext_tx_compress_dxtn = NULL; void *dxtlibhandle = NULL; @@ -172,7 +172,7 @@ texstore_rgb_dxt1(STORE_PARAMS) texWidth, (GLubyte *) dstAddr); if (ext_tx_compress_dxtn) { - (*ext_tx_compress_dxtn)(3, srcWidth, srcHeight, pixels, GL_COMPRESSED_RGB_S3TC_DXT1_EXT, dst); + (*ext_tx_compress_dxtn)(3, srcWidth, srcHeight, pixels, GL_COMPRESSED_RGB_S3TC_DXT1_EXT, dst, dstRowStride); } else { _mesa_problem(ctx, "external dxt library not available"); @@ -231,7 +231,7 @@ texstore_rgba_dxt1(STORE_PARAMS) GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, texWidth, (GLubyte *) dstAddr); if (ext_tx_compress_dxtn) { - (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, dst); + (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, dst, dstRowStride); } else { _mesa_problem(ctx, "external dxt library not available"); @@ -289,7 +289,7 @@ texstore_rgba_dxt3(STORE_PARAMS) GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, texWidth, (GLubyte *) dstAddr); if (ext_tx_compress_dxtn) { - (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, dst); + (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, dst, dstRowStride); } else { _mesa_problem(ctx, "external dxt library not available"); @@ -347,7 +347,7 @@ texstore_rgba_dxt5(STORE_PARAMS) GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, texWidth, (GLubyte *) dstAddr); if (ext_tx_compress_dxtn) { - (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, dst); + (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, dst, dstRowStride); } else { _mesa_problem(ctx, "external dxt library not available"); -- 2.30.2