commit 9328f3a670993167d7fb9a590f9e712467e77c7c
author Luca Barbieri <luca@luca-barbieri.com> Tue Jan 19 17:39:27 2010 -0800
committer Brian Paul <brianp@vmware.com> Mon Jan 25 08:11:49 2010 -0700
tree a68b5f92ab08ee4b8865bec29414a8300615e933
parent 2204447de320afe201a9369f57658cae0a11a440

Fix compressed texture loads for non-minimal pitches again

My commit eea6a7639f767b1d30b6ef1f91a9c49e3f3b78f0 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>

src/mesa/state_tracker/st_cb_texture.c

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index b94bfc8..cee2452 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -686,9 +686,11 @@
       {
          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;