Mesa (staging/21.2): radv: Handle copying zero queries.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 74e63763ee010f2f5120639eee4fddcce221d14a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=74e63763ee010f2f5120639eee4fddcce221d14a

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Fri Sep 17 00:45:11 2021 +0200

radv: Handle copying zero queries.

Looks like this is allowed.

Fixes: 8475a14302e ("radv: Implement pipeline statistics queries.")
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12907>
(cherry picked from commit ad0bd2a7d27e864d59dff159f8284110ccebb8bd)

---

 .pick_status.json           | 2 +-
 src/amd/vulkan/radv_query.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7021a0cceba..3eadfa64950 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -220,7 +220,7 @@
         "description": "radv: Handle copying zero queries.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8475a14302eaf0ff3c6a6c37dd87471a8ab73d84"
     },
diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index f5353e8dacb..5cd1ca2ef58 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -1214,6 +1214,9 @@ radv_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPoo
    uint64_t dest_va = radv_buffer_get_va(dst_buffer->bo);
    dest_va += dst_buffer->offset + dstOffset;
 
+   if (!queryCount)
+      return;
+
    radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs, pool->bo);
    radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs, dst_buffer->bo);