encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-17 17:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan: make mappableBuffersForEagerTransition ref buffers

Browse Source 
There are some scenarios where buffers can be used in pending
commands that are not retained by a command buffer.

They must be retained in the set of mappable buffers for eager
transition to prevent a use-after-free violation.

Fixed: chromium:1421170
Change-Id: I452d80b2513a7726a003d44e2a7850292d798bb1
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/122580
Auto-Submit: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Loko Kung <lokokung@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Peng Huang <penghuang@chromium.org>
This commit is contained in:
Austin Eng
2023-03-06 22:09:26 +00:00
committed by Dawn LUCI CQ
parent 8525ff29da
commit aaae3ffada
6 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dawn/native/vulkan/BufferVk.cpp
View File

@@ -416,9 +416,8 @@ bool Buffer::EnsureDataInitializedAsDestination(CommandRecordingContext* recordi
// static
void Buffer::TransitionMappableBuffersEagerly(const VulkanFunctions& fn,
CommandRecordingContext* recordingContext,
std::set<Buffer*> buffers) {
const std::set<Ref<Buffer>>& buffers) {
ASSERT(!buffers.empty());
ASSERT(recordingContext->mappableBuffersForEagerTransition.empty());
VkPipelineStageFlags srcStages = 0;
VkPipelineStageFlags dstStages = 0;
@@ -426,7 +425,8 @@ void Buffer::TransitionMappableBuffersEagerly(const VulkanFunctions& fn,
std::vector<VkBufferMemoryBarrier> barriers;
barriers.reserve(buffers.size());
for (Buffer* buffer : buffers) {
size_t originalBufferCount = buffers.size();
for (const Ref<Buffer>& buffer : buffers) {
wgpu::BufferUsage mapUsage = buffer->GetUsage() & kMapUsages;
ASSERT(mapUsage == wgpu::BufferUsage::MapRead || mapUsage == wgpu::BufferUsage::MapWrite);
VkBufferMemoryBarrier barrier;
@@ -435,9 +435,9 @@ void Buffer::TransitionMappableBuffersEagerly(const VulkanFunctions& fn,
&srcStages, &dstStages)) {
barriers.push_back(barrier);
}
// TrackUsageAndGetResourceBarrier() should not modify recordingContext for map usages.
ASSERT(recordingContext->mappableBuffersForEagerTransition.empty());
}
// TrackUsageAndGetResourceBarrier() should not modify recordingContext for map usages.
ASSERT(buffers.size() == originalBufferCount);
if (barriers.empty()) {
return;

2
src/dawn/native/vulkan/BufferVk.h
View File

@@ -58,7 +58,7 @@ class Buffer final : public BufferBase {
static void TransitionMappableBuffersEagerly(const VulkanFunctions& fn,
CommandRecordingContext* recordingContext,
std::set<Buffer*> buffers);
const std::set<Ref<Buffer>>& buffers);
private:
~Buffer() override;

2
src/dawn/native/vulkan/CommandRecordingContext.h
View File

@@ -50,7 +50,7 @@ struct CommandRecordingContext {
// Mappable buffers which will be eagerly transitioned to usage MapRead or MapWrite after
// VkSubmit.
std::set<Buffer*> mappableBuffersForEagerTransition;
std::set<Ref<Buffer>> mappableBuffersForEagerTransition;
// For Device state tracking only.
VkCommandPool commandPool = VK_NULL_HANDLE;

2
src/dawn/native/vulkan/DeviceVk.cpp
View File

@@ -310,7 +310,7 @@ MaybeError Device::SubmitPendingCommands() {
if (!mRecordingContext.mappableBuffersForEagerTransition.empty()) {
// Transition mappable buffers back to map usages with the submit.
Buffer::TransitionMappableBuffersEagerly(
fn, &mRecordingContext, std::move(mRecordingContext.mappableBuffersForEagerTransition));
fn, &mRecordingContext, mRecordingContext.mappableBuffersForEagerTransition);
}
ScopedSignalSemaphore scopedSignalSemaphore(this, VK_NULL_HANDLE);