if (!(srcFormat == GL_RGB || srcFormat == GL_RGBA) ||
srcType != GL_UNSIGNED_BYTE ||
ctx->_ImageTransferState ||
- ALIGN(srcPacking->RowLength, srcPacking->Alignment) != srcWidth ||
+ _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType) != srccomps * srcWidth * sizeof(GLubyte) ||
srcPacking->SkipImages ||
srcPacking->SwapBytes) {
/* convert image to RGB/GLubyte */
const GLubyte *pixels;
GLubyte *dst;
const GLubyte *tempImage = NULL;
+ int rgbaRowStride = 4 * srcWidth * sizeof(GLubyte);
assert(dstFormat == MESA_FORMAT_RGBA_DXT1 ||
dstFormat == MESA_FORMAT_SRGBA_DXT1);
if (srcFormat != GL_RGBA ||
srcType != GL_UNSIGNED_BYTE ||
ctx->_ImageTransferState ||
- ALIGN(srcPacking->RowLength, srcPacking->Alignment) != srcWidth ||
+ _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType) != rgbaRowStride ||
srcPacking->SkipImages ||
srcPacking->SwapBytes) {
/* convert image to RGBA/GLubyte */
GLubyte *tempImageSlices[1];
- int rgbaRowStride = 4 * srcWidth * sizeof(GLubyte);
tempImage = malloc(srcWidth * srcHeight * 4 * sizeof(GLubyte));
if (!tempImage)
return GL_FALSE; /* out of memory */
const GLubyte *pixels;
GLubyte *dst;
const GLubyte *tempImage = NULL;
+ int rgbaRowStride = 4 * srcWidth * sizeof(GLubyte);
assert(dstFormat == MESA_FORMAT_RGBA_DXT3 ||
dstFormat == MESA_FORMAT_SRGBA_DXT3);
if (srcFormat != GL_RGBA ||
srcType != GL_UNSIGNED_BYTE ||
ctx->_ImageTransferState ||
- ALIGN(srcPacking->RowLength, srcPacking->Alignment) != srcWidth ||
+ _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType) != rgbaRowStride ||
srcPacking->SkipImages ||
srcPacking->SwapBytes) {
/* convert image to RGBA/GLubyte */
GLubyte *tempImageSlices[1];
- int rgbaRowStride = 4 * srcWidth * sizeof(GLubyte);
tempImage = malloc(srcWidth * srcHeight * 4 * sizeof(GLubyte));
if (!tempImage)
return GL_FALSE; /* out of memory */
const GLubyte *pixels;
GLubyte *dst;
const GLubyte *tempImage = NULL;
+ int rgbaRowStride = 4 * srcWidth * sizeof(GLubyte);
assert(dstFormat == MESA_FORMAT_RGBA_DXT5 ||
dstFormat == MESA_FORMAT_SRGBA_DXT5);
if (srcFormat != GL_RGBA ||
srcType != GL_UNSIGNED_BYTE ||
ctx->_ImageTransferState ||
- ALIGN(srcPacking->RowLength, srcPacking->Alignment) != srcWidth ||
+ _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType) != rgbaRowStride ||
srcPacking->SkipImages ||
srcPacking->SwapBytes) {
/* convert image to RGBA/GLubyte */
GLubyte *tempImageSlices[1];
- int rgbaRowStride = 4 * srcWidth * sizeof(GLubyte);
tempImage = malloc(srcWidth * srcHeight * 4 * sizeof(GLubyte));
if (!tempImage)
return GL_FALSE; /* out of memory */