Mesa (staging/22.0): util/draw: fix map size of indirect buffer in util_draw_indirect_read

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 7ce96af539eb5531458debc5872a1c953be6eac1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ce96af539eb5531458debc5872a1c953be6eac1

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Apr 15 10:34:03 2022 -0400

util/draw: fix map size of indirect buffer in util_draw_indirect_read

this was incorrectly calculating too small of a map region if
the stride was less than the size of the struct

Fixes: 3eb99323172 ("aux/draw: add a util function for reading back indirect draw params")

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15963>
(cherry picked from commit efca37d4154496f9318064ff40e931233a4e5748)

---

 .pick_status.json                   | 2 +-
 src/gallium/auxiliary/util/u_draw.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 5b13c019a54..c8397482538 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -316,7 +316,7 @@
         "description": "util/draw: fix map size of indirect buffer in util_draw_indirect_read",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "3eb99323172902d34c80782aaa2d110567749cd9"
     },
     {
diff --git a/src/gallium/auxiliary/util/u_draw.c b/src/gallium/auxiliary/util/u_draw.c
index d65ac6a6497..70721586738 100644
--- a/src/gallium/auxiliary/util/u_draw.c
+++ b/src/gallium/auxiliary/util/u_draw.c
@@ -158,12 +158,11 @@ util_draw_indirect_read(struct pipe_context *pipe,
    if (!draws)
       return NULL;
 
-   if (indirect->stride)
-      num_params = MIN2(indirect->stride / 4, num_params);
+   unsigned map_size = (draw_count - 1) * indirect->stride + (num_params * sizeof(uint32_t));
    params = pipe_buffer_map_range(pipe,
                                   indirect->buffer,
                                   indirect->offset,
-                                  (num_params * indirect->draw_count) * sizeof(uint32_t),
+                                  map_size,
                                   PIPE_MAP_READ,
                                   &transfer);
    if (!transfer) {