Mesa (master): nouveau: Take into account sx, sy parameters to read from source surface

[Patrice Mandin]

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

Author: Patrice Mandin <patmandin at gmail.com>
Date:   Wed Jul 22 21:10:20 2009 +0200

nouveau: Take into account sx,sy parameters to read from source surface

---

 src/gallium/drivers/nv04/nv04_surface_2d.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nv04/nv04_surface_2d.c b/src/gallium/drivers/nv04/nv04_surface_2d.c
index f315cf5..d794c07 100644
--- a/src/gallium/drivers/nv04/nv04_surface_2d.c
+++ b/src/gallium/drivers/nv04/nv04_surface_2d.c
@@ -153,8 +153,8 @@ nv04_surface_copy_swizzle(struct nv04_surface_2d *ctx,
 	    OUT_RING  (chan, src_pitch |
 			     NV04_SCALED_IMAGE_FROM_MEMORY_FORMAT_ORIGIN_CENTER |
 			     NV04_SCALED_IMAGE_FROM_MEMORY_FORMAT_FILTER_POINT_SAMPLE);
-	    OUT_RELOCl(chan, src_bo, src->offset + cy * src_pitch +
-			     cx * src->texture->block.size, NOUVEAU_BO_GART |
+	    OUT_RELOCl(chan, src_bo, src->offset + (cy+sy) * src_pitch +
+			     (cx+sx) * src->texture->block.size, NOUVEAU_BO_GART |
 			     NOUVEAU_BO_VRAM | NOUVEAU_BO_RD);
 	    OUT_RING  (chan, 0);
 	  }