From: Marek Olšák <maraeo@gmail.com>
Date: Wed, 29 May 2013 21:08:11 +0000 (+0200)
Subject: st/dri: fix MSAA resolving of buffers with height > width
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=683b065320dc6e15383be931648c6e7cbe175b40;p=mesa.git

st/dri: fix MSAA resolving of buffers with height > width

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/gallium/state_trackers/dri/common/dri_drawable.c b/src/gallium/state_trackers/dri/common/dri_drawable.c
index cd4a36a139f..f784ee65ea9 100644
--- a/src/gallium/state_trackers/dri/common/dri_drawable.c
+++ b/src/gallium/state_trackers/dri/common/dri_drawable.c
@@ -374,12 +374,12 @@ dri_msaa_resolve(struct dri_context *ctx,
    memset(&blit, 0, sizeof(blit));
    blit.dst.resource = dst;
    blit.dst.box.width = dst->width0;
-   blit.dst.box.height = dst->width0;
+   blit.dst.box.height = dst->height0;
    blit.dst.box.depth = 1;
    blit.dst.format = util_format_linear(dst->format);
    blit.src.resource = src;
    blit.src.box.width = src->width0;
-   blit.src.box.height = src->width0;
+   blit.src.box.height = src->height0;
    blit.src.box.depth = 1;
    blit.src.format = util_format_linear(src->format);
    blit.mask = PIPE_MASK_RGBA;