From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date: Sat, 6 Apr 2013 12:15:54 +0000 (+0200)
Subject: nvc0: fix 2D engine MS2 resolve
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2b62ba7cb0e69cae721545e8775193f87955dec8;p=mesa.git

nvc0: fix 2D engine MS2 resolve
---

diff --git a/src/gallium/drivers/nvc0/nvc0_surface.c b/src/gallium/drivers/nvc0/nvc0_surface.c
index 3abf717a6ee..4e8bb36e18f 100644
--- a/src/gallium/drivers/nvc0/nvc0_surface.c
+++ b/src/gallium/drivers/nvc0/nvc0_surface.c
@@ -1038,8 +1038,8 @@ nvc0_blit_eng2d(struct nvc0_context *nvc0, const struct pipe_blit_info *info)
 
    if (src->base.base.nr_samples > dst->base.base.nr_samples) {
       /* center src coorinates for proper MS resolve filtering */
-      srcx += (int64_t)src->ms_x << 32;
-      srcy += (int64_t)src->ms_y << 32;
+      srcx += (int64_t)(src->ms_x + 0) << 32;
+      srcy += (int64_t)(src->ms_y + 1) << 31;
    }
 
    dstx = info->dst.box.x << dst->ms_x;