Mesa (master): dri/nv04: Align SIFM transfer dimensions.

[Francisco Jerez]

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

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Wed Sep 15 06:09:21 2010 +0200

dri/nv04: Align SIFM transfer dimensions.

---

 src/mesa/drivers/dri/nouveau/nv04_surface.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nv04_surface.c b/src/mesa/drivers/dri/nouveau/nv04_surface.c
index e3febf7..9e7dcf0 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);