Mesa (master): llvmpipe: Undo zs tiling changes.

[Jose Fonseca]

Module: Mesa
Branch: master
Commit: c059565054e80bd6306e1c3a2c7b85ef33082d9f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c059565054e80bd6306e1c3a2c7b85ef33082d9f

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Apr 22 20:38:36 2010 +0100

llvmpipe: Undo zs tiling changes.

tile_w/tile_h have different meaning there.

This partialy reverts commit ccdc6b5913885866e100780bfd661672c9a5d23c.

---

 src/gallium/drivers/llvmpipe/lp_tile_image.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_tile_image.c b/src/gallium/drivers/llvmpipe/lp_tile_image.c
index af3d157..7a2cc3e 100644
--- a/src/gallium/drivers/llvmpipe/lp_tile_image.c
+++ b/src/gallium/drivers/llvmpipe/lp_tile_image.c
@@ -142,7 +142,9 @@ lp_tiled_to_linear(const void *src, void *dst,
     */
    if (util_format_is_depth_or_stencil(format)) {
       const uint bpp = util_format_get_blocksize(format);
+      const uint src_stride = dst_stride * TILE_VECTOR_WIDTH;
       const uint tile_w = TILE_VECTOR_WIDTH, tile_h = TILE_VECTOR_HEIGHT;
+      const uint tiles_per_row = src_stride / (tile_w * tile_h * bpp);
 
       dst_stride /= bpp;   /* convert from bytes to words */
 
@@ -230,7 +232,9 @@ lp_linear_to_tiled(const void *src, void *dst,
 
    if (util_format_is_depth_or_stencil(format)) {
       const uint bpp = util_format_get_blocksize(format);
+      const uint dst_stride = src_stride * TILE_VECTOR_WIDTH;
       const uint tile_w = TILE_VECTOR_WIDTH, tile_h = TILE_VECTOR_HEIGHT;
+      const uint tiles_per_row = dst_stride / (tile_w * tile_h * bpp);
 
       src_stride /= bpp;   /* convert from bytes to words */