From 22d5747719c4a040f668ce598b2cd6398ff45c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Thu, 30 Sep 2021 17:24:16 -0700 Subject: [PATCH] Cleanup. --- src/renderer_vk.cpp | 8 ++++---- src/renderer_vk.h | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp index ba185eb92..6bff243f8 100644 --- a/src/renderer_vk.cpp +++ b/src/renderer_vk.cpp @@ -2828,7 +2828,7 @@ VK_IMPORT_DEVICE newFrameBuffer.acquire(m_commandBuffer); int64_t now = bx::getHPCounter(); - + if (NULL != newFrameBuffer.m_nwh) { m_presentElapsed += now - start; @@ -6795,8 +6795,8 @@ VK_DESTROY const uint32_t minSwapBufferCount = bx::max(surfaceCapabilities.minImageCount, 2); const uint32_t maxSwapBufferCount = surfaceCapabilities.maxImageCount == 0 - ? SwapChainVK::MaxBackBuffers - : bx::min(surfaceCapabilities.maxImageCount, SwapChainVK::MaxBackBuffers) + ? kMaxBackBuffers + : bx::min(surfaceCapabilities.maxImageCount, kMaxBackBuffers) ; if (minSwapBufferCount > maxSwapBufferCount) @@ -6804,7 +6804,7 @@ VK_DESTROY BX_TRACE("Create swapchain error: Incompatible swapchain image count (min: %d, max: %d, MaxBackBuffers: %d)." , minSwapBufferCount , maxSwapBufferCount - , SwapChainVK::MaxBackBuffers + , kMaxBackBuffers ); return VK_ERROR_INITIALIZATION_FAILED; } diff --git a/src/renderer_vk.h b/src/renderer_vk.h index 64339f2d0..3e1479903 100644 --- a/src/renderer_vk.h +++ b/src/renderer_vk.h @@ -660,6 +660,8 @@ VK_DESTROY_FUNC(DescriptorSet); static VkImageAspectFlags getAspectMask(VkFormat _format); }; + constexpr uint32_t kMaxBackBuffers = bx::max(BGFX_CONFIG_MAX_BACK_BUFFERS, 10); + struct SwapChainVK { SwapChainVK() @@ -672,7 +674,7 @@ VK_DESTROY_FUNC(DescriptorSet); } VkResult create(VkCommandBuffer _commandBuffer, void* _nwh, const Resolution& _resolution, TextureFormat::Enum _depthFormat = TextureFormat::Count); - + void destroy(); void update(VkCommandBuffer _commandBuffer, void* _nwh, const Resolution& _resolution); @@ -704,29 +706,27 @@ VK_DESTROY_FUNC(DescriptorSet); TextureFormat::Enum m_colorFormat; TextureFormat::Enum m_depthFormat; - static constexpr size_t MaxBackBuffers = bx::max(BGFX_CONFIG_MAX_BACK_BUFFERS, 10); - VkSurfaceKHR m_surface; VkSwapchainKHR m_swapchain; uint32_t m_numSwapchainImages; - VkImageLayout m_backBufferColorImageLayout[MaxBackBuffers]; - VkImage m_backBufferColorImage[MaxBackBuffers]; - VkImageView m_backBufferColorImageView[MaxBackBuffers]; - VkFramebuffer m_backBufferFrameBuffer[MaxBackBuffers]; - VkFence m_backBufferFence[MaxBackBuffers]; + VkImageLayout m_backBufferColorImageLayout[kMaxBackBuffers]; + VkImage m_backBufferColorImage[kMaxBackBuffers]; + VkImageView m_backBufferColorImageView[kMaxBackBuffers]; + VkFramebuffer m_backBufferFrameBuffer[kMaxBackBuffers]; + VkFence m_backBufferFence[kMaxBackBuffers]; uint32_t m_backBufferColorIdx; - VkSemaphore m_presentDoneSemaphore[MaxBackBuffers]; - VkSemaphore m_renderDoneSemaphore[MaxBackBuffers]; + VkSemaphore m_presentDoneSemaphore[kMaxBackBuffers]; + VkSemaphore m_renderDoneSemaphore[kMaxBackBuffers]; uint32_t m_currentSemaphore; VkSemaphore m_lastImageRenderedSemaphore; VkSemaphore m_lastImageAcquiredSemaphore; - + bool m_needPresent; bool m_needToRefreshSwapchain; bool m_needToRecreateSurface; - + TextureVK m_backBufferDepthStencil; VkImageView m_backBufferDepthStencilImageView;