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

st/mesa: don't use gl_texture_image::RowStride

Browse source 
It's always the same as the texture width.
This commit is contained in:
Brian Paul 2011-10-05 21:14:37 -06:00
parent aff65241c8
commit cf2439e246
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/state_tracker/st_cb_texture.c
View file

@ -1685,16 +1685,18 @@ copy_image_data_to_texture(struct st_context *st,
pipe_resource_reference(&stImage->pt, NULL);
}
else if (stImage->TexData) {
/* Copy from malloc'd memory */
/* XXX this should be re-examined/tested with a compressed format */
GLuint blockSize = util_format_get_blocksize(stObj->pt->format);
GLuint srcRowStride = stImage->base.Width * blockSize;
GLuint srcSliceStride = stImage->base.Height * srcRowStride;
st_texture_image_data(st,
stObj->pt,
stImage->base.Face,
dstLevel,
stImage->TexData,
stImage->base.RowStride *
util_format_get_blocksize(stObj->pt->format),
stImage->base.RowStride *
stImage->base.Height *
util_format_get_blocksize(stObj->pt->format));
srcRowStride,
srcSliceStride);
_mesa_align_free(stImage->TexData);
stImage->TexData = NULL;
}