fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 03:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix a few stride computations in _mesa_texstore_rgba()

Browse source
This commit is contained in:
Brian Paul 2006-04-26 18:43:22 +00:00
parent e440bcf41a
commit edc16a5f7a
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/main/texstore.c
View file

@ -560,7 +560,7 @@ swizzle_copy(GLubyte *dst, GLuint dstComponents, const GLubyte *src,
GLuint srcComponents, const GLubyte *map, GLuint count)
{
GLubyte tmp[8];
GLint i;
GLuint i;
tmp[ZERO] = 0x0;
tmp[ONE] = 0xff;
@ -637,6 +637,8 @@ _mesa_swizzle_ubyte_image(GLcontext *ctx,
+ dstYoffset * dstRowStride
+ dstXoffset * dstComponents;
(void) ctx;
compute_component_mapping(srcFormat, GL_RGBA, srcmap);
for (i = 0; i < 4; i++)
@ -790,10 +792,10 @@ _mesa_texstore_rgba(GLcontext *ctx, GLuint dims,
srcType == CHAN_TYPE) {
/* extract RGB from RGBA */
int img, row, col;
GLchan *dstImage = (GLchan *) (GLubyte *) dstAddr
+ dstZoffset * dstImageStride
+ dstYoffset * dstRowStride
+ dstXoffset * dstFormat->TexelBytes;
GLchan *dstImage = (GLchan *) ((GLubyte *) dstAddr
+ dstZoffset * dstImageStride
+ dstYoffset * dstRowStride
+ dstXoffset * dstFormat->TexelBytes);
for (img = 0; img < srcDepth; img++) {
const GLint srcRowStride = _mesa_image_row_stride(srcPacking,
srcWidth, srcFormat, srcType);
@ -806,10 +808,10 @@ _mesa_texstore_rgba(GLcontext *ctx, GLuint dims,
dstRow[col * 3 + GCOMP] = srcRow[col * 4 + GCOMP];
dstRow[col * 3 + BCOMP] = srcRow[col * 4 + BCOMP];
}
dstRow += dstRowStride;
dstRow += dstRowStride / sizeof(GLchan);
srcRow = (GLchan *) ((GLubyte *) srcRow + srcRowStride);
}
dstImage += dstImageStride;
dstImage += dstImageStride / sizeof(GLchan);
}
}
else {