From: Eric Anholt <eric@anholt.net>
Date: Mon, 9 Jul 2018 21:09:07 +0000 (-0700)
Subject: gallium/u_transfer_helper: Fix MSAA mappings with nonzero x/y.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=589bb5bd6571f03d85e5bbc835549d9a0d71ead1;p=mesa.git

gallium/u_transfer_helper: Fix MSAA mappings with nonzero x/y.

We created a temporary with box->{width,height} and then tried to map
width,height from a nonzero offset when we meant to just map the whole
temporary.

Fixes segfaults in V3D in dEQP-GLES3.functional.prerequisite.read_pixels
with --deqp-egl-config-name=rgba8888d24s8ms4 and also piglit's read-front
clear-front-first -samples=4

Reviewed-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/src/gallium/auxiliary/util/u_transfer_helper.c b/src/gallium/auxiliary/util/u_transfer_helper.c
index 3b085fd99f0..fd8a5c3a089 100644
--- a/src/gallium/auxiliary/util/u_transfer_helper.c
+++ b/src/gallium/auxiliary/util/u_transfer_helper.c
@@ -207,7 +207,11 @@ transfer_map_msaa(struct pipe_context *pctx,
       pctx->blit(pctx, &blit);
    }
 
-   void *ss_map = pctx->transfer_map(pctx, trans->ss, 0, usage, box,
+   struct pipe_box map_box = *box;
+   map_box.x = 0;
+   map_box.y = 0;
+
+   void *ss_map = pctx->transfer_map(pctx, trans->ss, 0, usage, &map_box,
          &trans->trans);
    if (!ss_map) {
       free(trans);