diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-01-17 00:30:33 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-02-13 06:16:21 +0100 |
commit | 004a8d6a7ac0e02875c71bd4f81dd88666e88f82 (patch) | |
tree | 154a0db4b59f58e2b234b6ccdbd4b15f94baf1e2 | |
parent | vulkan_wrapper: Add interop functions (diff) | |
download | yuzu-004a8d6a7ac0e02875c71bd4f81dd88666e88f82.tar yuzu-004a8d6a7ac0e02875c71bd4f81dd88666e88f82.tar.gz yuzu-004a8d6a7ac0e02875c71bd4f81dd88666e88f82.tar.bz2 yuzu-004a8d6a7ac0e02875c71bd4f81dd88666e88f82.tar.lz yuzu-004a8d6a7ac0e02875c71bd4f81dd88666e88f82.tar.xz yuzu-004a8d6a7ac0e02875c71bd4f81dd88666e88f82.tar.zst yuzu-004a8d6a7ac0e02875c71bd4f81dd88666e88f82.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/vulkan_common/vulkan_device.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 51f53bc39..130b2a5e0 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -18,23 +18,19 @@ #include "video_core/vulkan_common/vulkan_wrapper.h" namespace Vulkan { - namespace { - namespace Alternatives { - -constexpr std::array Depth24UnormS8_UINT{ +constexpr std::array DEPTH24_UNORM_STENCIL8_UINT{ VK_FORMAT_D32_SFLOAT_S8_UINT, VK_FORMAT_D16_UNORM_S8_UINT, - VkFormat{}, + VK_FORMAT_UNDEFINED, }; -constexpr std::array Depth16UnormS8_UINT{ +constexpr std::array DEPTH16_UNORM_STENCIL8_UINT{ VK_FORMAT_D24_UNORM_S8_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, - VkFormat{}, + VK_FORMAT_UNDEFINED, }; - } // namespace Alternatives constexpr std::array REQUIRED_EXTENSIONS{ @@ -63,9 +59,9 @@ void SetNext(void**& next, T& data) { constexpr const VkFormat* GetFormatAlternatives(VkFormat format) { switch (format) { case VK_FORMAT_D24_UNORM_S8_UINT: - return Alternatives::Depth24UnormS8_UINT.data(); + return Alternatives::DEPTH24_UNORM_STENCIL8_UINT.data(); case VK_FORMAT_D16_UNORM_S8_UINT: - return Alternatives::Depth16UnormS8_UINT.data(); + return Alternatives::DEPTH16_UNORM_STENCIL8_UINT.data(); default: return nullptr; } |