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

Vulkan: support fenced deletion of swapchain objects

This commit is contained in:
Corentin Wallez 2018-01-26 16:47:12 -05:00 committed by Corentin Wallez
parent eb45309722
commit dd5ff104ec
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/backend/vulkan/FencedDeleter.cpp
View File

@ -30,7 +30,10 @@ namespace backend { namespace vulkan {
ASSERT(mPipelinesToDelete.Empty()); ASSERT(mPipelinesToDelete.Empty());
ASSERT(mPipelineLayoutsToDelete.Empty()); ASSERT(mPipelineLayoutsToDelete.Empty());
ASSERT(mRenderPassesToDelete.Empty()); ASSERT(mRenderPassesToDelete.Empty());
ASSERT(mSemaphoresToDelete.Empty());
ASSERT(mShaderModulesToDelete.Empty()); ASSERT(mShaderModulesToDelete.Empty());
ASSERT(mSurfacesToDelete.Empty());
ASSERT(mSwapChainsToDelete.Empty());
} }
void FencedDeleter::DeleteWhenUnused(VkBuffer buffer) { void FencedDeleter::DeleteWhenUnused(VkBuffer buffer) {
@ -65,12 +68,25 @@ namespace backend { namespace vulkan {
mRenderPassesToDelete.Enqueue(renderPass, mDevice->GetSerial()); mRenderPassesToDelete.Enqueue(renderPass, mDevice->GetSerial());
} }
void FencedDeleter::DeleteWhenUnused(VkSemaphore semaphore) {
mSemaphoresToDelete.Enqueue(semaphore, mDevice->GetSerial());
}
void FencedDeleter::DeleteWhenUnused(VkShaderModule module) { void FencedDeleter::DeleteWhenUnused(VkShaderModule module) {
mShaderModulesToDelete.Enqueue(module, mDevice->GetSerial()); mShaderModulesToDelete.Enqueue(module, mDevice->GetSerial());
} }
void FencedDeleter::DeleteWhenUnused(VkSurfaceKHR surface) {
mSurfacesToDelete.Enqueue(surface, mDevice->GetSerial());
}
void FencedDeleter::DeleteWhenUnused(VkSwapchainKHR swapChain) {
mSwapChainsToDelete.Enqueue(swapChain, mDevice->GetSerial());
}
void FencedDeleter::Tick(Serial completedSerial) { void FencedDeleter::Tick(Serial completedSerial) {
VkDevice vkDevice = mDevice->GetVkDevice(); VkDevice vkDevice = mDevice->GetVkDevice();
VkInstance instance = mDevice->GetInstance();
// Buffers and images must be deleted before memories because it is invalid to free memory // Buffers and images must be deleted before memories because it is invalid to free memory
// that still have resources bound to it. // that still have resources bound to it.
@ -117,6 +133,21 @@ namespace backend { namespace vulkan {
mDevice->fn.DestroyPipeline(vkDevice, pipeline, nullptr); mDevice->fn.DestroyPipeline(vkDevice, pipeline, nullptr);
} }
mPipelinesToDelete.ClearUpTo(completedSerial); mPipelinesToDelete.ClearUpTo(completedSerial);
// Vulkan swapchains must be destroyed before their corresponding VkSurface
for (VkSwapchainKHR swapChain : mSwapChainsToDelete.IterateUpTo(completedSerial)) {
mDevice->fn.DestroySwapchainKHR(vkDevice, swapChain, nullptr);
}
mSwapChainsToDelete.ClearUpTo(completedSerial);
for (VkSurfaceKHR surface : mSurfacesToDelete.IterateUpTo(completedSerial)) {
mDevice->fn.DestroySurfaceKHR(instance, surface, nullptr);
}
mSurfacesToDelete.ClearUpTo(completedSerial);
for (VkSemaphore semaphore : mSemaphoresToDelete.IterateUpTo(completedSerial)) {
mDevice->fn.DestroySemaphore(vkDevice, semaphore, nullptr);
}
mSemaphoresToDelete.ClearUpTo(completedSerial);
} }
}} // namespace backend::vulkan }} // namespace backend::vulkan

6
src/backend/vulkan/FencedDeleter.h
View File

@ -35,7 +35,10 @@ namespace backend { namespace vulkan {
void DeleteWhenUnused(VkPipelineLayout layout); void DeleteWhenUnused(VkPipelineLayout layout);
void DeleteWhenUnused(VkRenderPass renderPass); void DeleteWhenUnused(VkRenderPass renderPass);
void DeleteWhenUnused(VkPipeline pipeline); void DeleteWhenUnused(VkPipeline pipeline);
void DeleteWhenUnused(VkSemaphore semaphore);
void DeleteWhenUnused(VkShaderModule module); void DeleteWhenUnused(VkShaderModule module);
void DeleteWhenUnused(VkSurfaceKHR surface);
void DeleteWhenUnused(VkSwapchainKHR swapChain);
void Tick(Serial completedSerial); void Tick(Serial completedSerial);
@ -49,7 +52,10 @@ namespace backend { namespace vulkan {
SerialQueue<VkPipeline> mPipelinesToDelete; SerialQueue<VkPipeline> mPipelinesToDelete;
SerialQueue<VkPipelineLayout> mPipelineLayoutsToDelete; SerialQueue<VkPipelineLayout> mPipelineLayoutsToDelete;
SerialQueue<VkRenderPass> mRenderPassesToDelete; SerialQueue<VkRenderPass> mRenderPassesToDelete;
SerialQueue<VkSemaphore> mSemaphoresToDelete;
SerialQueue<VkShaderModule> mShaderModulesToDelete; SerialQueue<VkShaderModule> mShaderModulesToDelete;
SerialQueue<VkSurfaceKHR> mSurfacesToDelete;
SerialQueue<VkSwapchainKHR> mSwapChainsToDelete;
}; };
}} // namespace backend::vulkan }} // namespace backend::vulkan