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 recreating swapchain with SwapChain.Configure() 

This patch adds the support of recreating a swapchain with SwapChain.
Configure() on Vulkan backends.
1. Query the Vulkan surface information again.
2. Clean up old swapchain.

BUG=dawn:177

Change-Id: Id7e9e07e9dbbba4a71322367cae10fb179106220
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/9340
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
This commit is contained in:
Jiawei Shao 2019-07-25 01:08:14 +00:00 committed by Commit Bot service account
parent 2718177841
commit 9d2ccaf65c
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dawn_native/vulkan/NativeSwapChainImplVk.cpp
View File

@ -57,7 +57,7 @@ namespace dawn_native { namespace vulkan {
} }
} }
void NativeSwapChainImpl::Init(DawnWSIContextVulkan* /*context*/) { void NativeSwapChainImpl::UpdateSurfaceConfig() {
if (mDevice->ConsumedError( if (mDevice->ConsumedError(
GatherSurfaceInfo(*ToBackend(mDevice->GetAdapter()), mSurface, &mInfo))) { GatherSurfaceInfo(*ToBackend(mDevice->GetAdapter()), mSurface, &mInfo))) {
ASSERT(false); ASSERT(false);
@ -68,10 +68,16 @@ namespace dawn_native { namespace vulkan {
} }
} }
void NativeSwapChainImpl::Init(DawnWSIContextVulkan* /*context*/) {
UpdateSurfaceConfig();
}
DawnSwapChainError NativeSwapChainImpl::Configure(DawnTextureFormat format, DawnSwapChainError NativeSwapChainImpl::Configure(DawnTextureFormat format,
DawnTextureUsageBit usage, DawnTextureUsageBit usage,
uint32_t width, uint32_t width,
uint32_t height) { uint32_t height) {
UpdateSurfaceConfig();
ASSERT(mInfo.capabilities.minImageExtent.width <= width); ASSERT(mInfo.capabilities.minImageExtent.width <= width);
ASSERT(mInfo.capabilities.maxImageExtent.width >= width); ASSERT(mInfo.capabilities.maxImageExtent.width >= width);
ASSERT(mInfo.capabilities.minImageExtent.height <= height); ASSERT(mInfo.capabilities.minImageExtent.height <= height);
@ -81,6 +87,7 @@ namespace dawn_native { namespace vulkan {
// TODO(cwallez@chromium.org): need to check usage works too // TODO(cwallez@chromium.org): need to check usage works too
// Create the swapchain with the configuration we chose // Create the swapchain with the configuration we chose
VkSwapchainKHR oldSwapchain = mSwapChain;
VkSwapchainCreateInfoKHR createInfo; VkSwapchainCreateInfoKHR createInfo;
createInfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; createInfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
createInfo.pNext = nullptr; createInfo.pNext = nullptr;
@ -101,7 +108,7 @@ namespace dawn_native { namespace vulkan {
createInfo.compositeAlpha = mConfig.compositeAlpha; createInfo.compositeAlpha = mConfig.compositeAlpha;
createInfo.presentMode = mConfig.presentMode; createInfo.presentMode = mConfig.presentMode;
createInfo.clipped = false; createInfo.clipped = false;
createInfo.oldSwapchain = VK_NULL_HANDLE; createInfo.oldSwapchain = oldSwapchain;
if (mDevice->fn.CreateSwapchainKHR(mDevice->GetVkDevice(), &createInfo, nullptr, if (mDevice->fn.CreateSwapchainKHR(mDevice->GetVkDevice(), &createInfo, nullptr,
&mSwapChain) != VK_SUCCESS) { &mSwapChain) != VK_SUCCESS) {
@ -148,6 +155,10 @@ namespace dawn_native { namespace vulkan {
nullptr, 1, &barrier); nullptr, 1, &barrier);
} }
if (oldSwapchain != VK_NULL_HANDLE) {
mDevice->GetFencedDeleter()->DeleteWhenUnused(oldSwapchain);
}
return DAWN_SWAP_CHAIN_NO_ERROR; return DAWN_SWAP_CHAIN_NO_ERROR;
} }

2
src/dawn_native/vulkan/NativeSwapChainImplVk.h
View File

@ -52,6 +52,8 @@ namespace dawn_native { namespace vulkan {
}; };
private: private:
void UpdateSurfaceConfig();
VkSurfaceKHR mSurface = VK_NULL_HANDLE; VkSurfaceKHR mSurface = VK_NULL_HANDLE;
VkSwapchainKHR mSwapChain = VK_NULL_HANDLE; VkSwapchainKHR mSwapChain = VK_NULL_HANDLE;
std::vector<VkImage> mSwapChainImages; std::vector<VkImage> mSwapChainImages;