From: Francisco Jerez <currojerez@riseup.net>
Date: Wed, 15 Sep 2010 04:09:21 +0000 (+0200)
Subject: dri/nv04: Align SIFM transfer dimensions.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0a6cfa1668af7c5541c9d56436776514a6c493d9;p=mesa.git

dri/nv04: Align SIFM transfer dimensions.
---

diff --git a/src/mesa/drivers/dri/nouveau/nv04_surface.c b/src/mesa/drivers/dri/nouveau/nv04_surface.c
index e3febf7d2f7..9e7dcf0a88f 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_surface.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_surface.c
@@ -255,7 +255,7 @@ nv04_surface_copy_swizzle(GLcontext *ctx,
 
 			BEGIN_RING(chan, sifm,
 				   NV03_SCALED_IMAGE_FROM_MEMORY_SIZE, 4);
-			OUT_RING(chan, sub_h << 16 | sub_w);
+			OUT_RING(chan, align(sub_h, 2) << 16 | align(sub_w, 2));
 			OUT_RING(chan, src->pitch  |
 				 NV03_SCALED_IMAGE_FROM_MEMORY_FORMAT_ORIGIN_CENTER |
 				 NV03_SCALED_IMAGE_FROM_MEMORY_FORMAT_FILTER_POINT_SAMPLE);