From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 2 Sep 2014 22:28:39 +0000 (-0700)
Subject: i965/copy_image: Use the correct block dimension
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=499acf6e4a758be74dc5813a8c174da4360e046d;p=mesa.git

i965/copy_image: Use the correct block dimension

Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Cc: "10.3" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82804
Tested-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/intel_copy_image.c b/src/mesa/drivers/dri/i965/intel_copy_image.c
index 935f91cfbd9..8bda2dd594c 100644
--- a/src/mesa/drivers/dri/i965/intel_copy_image.c
+++ b/src/mesa/drivers/dri/i965/intel_copy_image.c
@@ -74,14 +74,14 @@ copy_image_with_blitter(struct brw_context *brw,
       _mesa_get_format_block_size(src_mt->format, &bw, &bh);
 
       assert(src_x % bw == 0);
-      assert(src_y % bw == 0);
+      assert(src_y % bh == 0);
       assert(src_width % bw == 0);
-      assert(src_height % bw == 0);
+      assert(src_height % bh == 0);
 
       src_x /= (int)bw;
-      src_y /= (int)bw;
+      src_y /= (int)bh;
       src_width /= (int)bw;
-      src_height /= (int)bw;
+      src_height /= (int)bh;
 
       cpp = _mesa_get_format_bytes(src_mt->format);
    } else {
@@ -92,10 +92,10 @@ copy_image_with_blitter(struct brw_context *brw,
       _mesa_get_format_block_size(dst_mt->format, &bw, &bh);
 
       assert(dst_x % bw == 0);
-      assert(dst_y % bw == 0);
+      assert(dst_y % bh == 0);
 
       dst_x /= (int)bw;
-      dst_y /= (int)bw;
+      dst_y /= (int)bh;
    }
 
    uint32_t src_image_x, src_image_y;