encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Li Hao 2021-07-27 01:22:29 +00:00 committed by Dawn LUCI CQ
parent 3b6af4ff53
commit 6e5b080547
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/dawn_native/vulkan/CommandBufferVk.cpp
View File

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