Mesa (master): nvc0: fix wrong use of BLIT_SRC_Y_INT for 2D texture copy

[Samuel Pitoiset]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Jul  6 22:06:08 2015 +0200

nvc0: fix wrong use of BLIT_SRC_Y_INT for 2D texture copy

According to nv50, this should be src->ms_y instead of src->ms_x. This
code is here since 2012, so it's probably a typo error which has never
been detected since a long time. I didn't do a full piglit run to check
if it fixes some other weird issues.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
index ac4dd25..3c17f16 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
@@ -189,7 +189,7 @@ nvc0_2d_texture_do_copy(struct nouveau_pushbuf *push,
    PUSH_DATA (push, 0);
    PUSH_DATA (push, sx << src->ms_x);
    PUSH_DATA (push, 0);
-   PUSH_DATA (push, sy << src->ms_x);
+   PUSH_DATA (push, sy << src->ms_y);
 
    return 0;
 }