Fix compressed texture loads for non-minimal pitches again

My commit eea6a7639f does a memcpy of height
lines, but that's wrong because the texture has a block layout and we
must thus use the number of vertical blocks instead of the height.

Signed-off-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Luca Barbieri 2010-01-19 17:39:27 -08:00 committed by Brian Paul
parent 2204447de3
commit 9328f3a670
1 changed files with 4 additions and 2 deletions

View File

@ -686,9 +686,11 @@ st_TexImage(GLcontext * ctx,
{
char *dst = texImage->Data;
const char *src = pixels;
int i;
GLuint i, bw, bh, lines;
_mesa_get_format_block_size(texImage->TexFormat, &bw, &bh);
lines = (height + bh - 1) / bh;
for(i = 0; i < height; ++i)
for(i = 0; i < lines; ++i)
{
memcpy(dst, src, srcImageStride);
dst += dstRowStride;