commit 6e5b08054755dc92f1559b46620d4a9635205c0a
author Li Hao <hao.x.li@intel.com> Tue Jul 27 01:22:29 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jul 27 01:22:29 2021 +0000
tree d56536a391f0157d1497489e1259c77d22553fde
parent 3b6af4ff53f511df9c14486d50263b83b96d3393

Improve buffer zero-initialization in resolveQuerySet on Vulkan

Simplify the buffer clear logic, and tolerate clear twice when resolving
unavailable queries if the destination buffer is not initialized and not
fully written.

Bug: dawn:973

Change-Id: Iaaf16acfd789787cb2f3eb18cd324c60d5f720b1
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/59680
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Hao Li <hao.x.li@intel.com>

src/dawn_native/vulkan/CommandBufferVk.cpp

diff --git a/src/dawn_native/vulkan/CommandBufferVk.cpp b/src/dawn_native/vulkan/CommandBufferVk.cpp
index 6409079..0d6dcda 100644
--- a/src/dawn_native/vulkan/CommandBufferVk.cpp
+++ b/src/dawn_native/vulkan/CommandBufferVk.cpp
@@ -732,27 +732,23 @@
                     QuerySet* querySet = ToBackend(cmd->querySet.Get());
                     Buffer* destination = ToBackend(cmd->destination.Get());
 
+                    destination->EnsureDataInitializedAsDestination(
+                        recordingContext, cmd->destinationOffset,
+                        cmd->queryCount * sizeof(uint64_t));
+
                     // vkCmdCopyQueryPoolResults only can retrieve available queries because
-                    // VK_QUERY_RESULT_WAIT_BIT is set, for these unavailable queries, we need to
-                    // clear the resolving region of the buffer to 0s if the buffer has been
-                    // initialized or fully used.
+                    // VK_QUERY_RESULT_WAIT_BIT is set. In order to resolve the unavailable queries
+                    // as 0s, we need to clear the resolving region of the destination buffer to 0s.
                     auto startIt = querySet->GetQueryAvailability().begin() + cmd->firstQuery;
                     auto endIt = querySet->GetQueryAvailability().begin() + cmd->firstQuery +
                                  cmd->queryCount;
                     bool hasUnavailableQueries = std::find(startIt, endIt, false) != endIt;
-                    if (hasUnavailableQueries &&
-                        (destination->IsDataInitialized() ||
-                         destination->IsFullBufferRange(cmd->destinationOffset,
-                                                        cmd->queryCount * sizeof(uint64_t)))) {
+                    if (hasUnavailableQueries) {
                         destination->TransitionUsageNow(recordingContext,
                                                         wgpu::BufferUsage::CopyDst);
                         device->fn.CmdFillBuffer(commands, destination->GetHandle(),
                                                  cmd->destinationOffset,
                                                  cmd->queryCount * sizeof(uint64_t), 0u);
-                    } else {
-                        destination->EnsureDataInitializedAsDestination(
-                            recordingContext, cmd->destinationOffset,
-                            cmd->queryCount * sizeof(uint64_t));
                     }
 
                     destination->TransitionUsageNow(recordingContext,