From f63192c6b203bfdfe124cdb7732caffebdb3957b Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 13 Sep 2020 00:05:38 +1000 Subject: [PATCH] Vulkan/SwapChain: Fix incorrect return from GetTextureFormat() --- src/common/vulkan/swap_chain.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/vulkan/swap_chain.h b/src/common/vulkan/swap_chain.h index e811b3a5f..eb2ab335c 100644 --- a/src/common/vulkan/swap_chain.h +++ b/src/common/vulkan/swap_chain.h @@ -31,7 +31,7 @@ public: ALWAYS_INLINE VkSurfaceKHR GetSurface() const { return m_surface; } ALWAYS_INLINE VkSurfaceFormatKHR GetSurfaceFormat() const { return m_surface_format; } - ALWAYS_INLINE VkFormat GetTextureFormat() const { return m_texture_format; } + ALWAYS_INLINE VkFormat GetTextureFormat() const { return m_surface_format.format; } ALWAYS_INLINE bool IsVSyncEnabled() const { return m_vsync_enabled; } ALWAYS_INLINE VkSwapchainKHR GetSwapChain() const { return m_swap_chain; } ALWAYS_INLINE u32 GetWidth() const { return m_width; } @@ -85,7 +85,6 @@ private: VkSurfaceKHR m_surface = VK_NULL_HANDLE; VkSurfaceFormatKHR m_surface_format = {}; VkPresentModeKHR m_present_mode = VK_PRESENT_MODE_IMMEDIATE_KHR; - VkFormat m_texture_format = VK_FORMAT_UNDEFINED; VkRenderPass m_load_render_pass = VK_NULL_HANDLE; VkRenderPass m_clear_render_pass = VK_NULL_HANDLE;