From: Brian Paul <brianp@vmware.com>
Date: Wed, 28 Apr 2010 16:06:05 +0000 (-0600)
Subject: st/mesa: fix incorrect RowStride computation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b640f9f708306b3e8c661771f29bf24bf8687fb;p=mesa.git

st/mesa: fix incorrect RowStride computation

Fixes incorrect stride when getting a compressed tex image.
---

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 92eefca2e79..61d3f0f98cc 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -931,7 +931,10 @@ st_get_tex_image(GLcontext * ctx, GLenum target, GLint level,
                                             PIPE_TRANSFER_READ, 0, 0,
                                             stImage->base.Width,
                                             stImage->base.Height);
-      texImage->RowStride = stImage->transfer->stride / util_format_get_blocksize(stImage->pt->format);
+      /* compute stride in texels from stride in bytes */
+      texImage->RowStride = stImage->transfer->stride
+         * util_format_get_blockwidth(stImage->pt->format)
+         / util_format_get_blocksize(stImage->pt->format);
    }
    else {
       /* Otherwise, the image should actually be stored in