summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2020-11-10 09:20:50 -0500
committerDylan Baker <dylan.c.baker@intel.com>2020-11-19 10:42:24 -0800
commit825a8846cc4f12a00c8257e25b168c712496b992 (patch)
tree7cce55080920c51a5c20fda43459761cc08124fd
parent40e3de32e13aea822713471a723ed8c8c432fda8 (diff)
radeonsi: fix min_direct_count value
It was always 0. Fixes: 0ce68852c "radeonsi: implement multi_draw but supporting only 1 draw" Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7542> (cherry picked from commit 74ea26f61367983640330cd572d66d30cf5ba3a8)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/radeonsi/si_state_draw.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index aed27e8cd30..5c9ab07617e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -715,7 +715,7 @@
"description": "radeonsi: fix min_direct_count value",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "0ce68852c1a8d37e837d64f97a2a2ef5d6b669a5"
},
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 18f5c2632d3..ff69f2c62d5 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -1940,6 +1940,7 @@ static void si_multi_draw_vbo(struct pipe_context *ctx,
}
}
} else {
+ min_direct_count = num_draws ? UINT_MAX : 0;
for (unsigned i = 0; i < num_draws; i++) {
unsigned count = draws[i].count;