summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2021-01-16 20:30:33 -0300
committerGravatar ReinUsesLisp2021-02-13 02:16:21 -0300
commit004a8d6a7ac0e02875c71bd4f81dd88666e88f82 (patch)
tree154a0db4b59f58e2b234b6ccdbd4b15f94baf1e2
parentvulkan_wrapper: Add interop functions (diff)
downloadyuzu-004a8d6a7ac0e02875c71bd4f81dd88666e88f82.tar.gz
yuzu-004a8d6a7ac0e02875c71bd4f81dd88666e88f82.tar.xz
yuzu-004a8d6a7ac0e02875c71bd4f81dd88666e88f82.zip
vulkan_device: Fix formatting of constants
-rw-r--r--src/video_core/vulkan_common/vulkan_device.cpp16
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 @@
18#include "video_core/vulkan_common/vulkan_wrapper.h" 18#include "video_core/vulkan_common/vulkan_wrapper.h"
19 19
20namespace Vulkan { 20namespace Vulkan {
21
22namespace { 21namespace {
23
24namespace Alternatives { 22namespace Alternatives {
25 23constexpr std::array DEPTH24_UNORM_STENCIL8_UINT{
26constexpr std::array Depth24UnormS8_UINT{
27 VK_FORMAT_D32_SFLOAT_S8_UINT, 24 VK_FORMAT_D32_SFLOAT_S8_UINT,
28 VK_FORMAT_D16_UNORM_S8_UINT, 25 VK_FORMAT_D16_UNORM_S8_UINT,
29 VkFormat{}, 26 VK_FORMAT_UNDEFINED,
30}; 27};
31 28
32constexpr std::array Depth16UnormS8_UINT{ 29constexpr std::array DEPTH16_UNORM_STENCIL8_UINT{
33 VK_FORMAT_D24_UNORM_S8_UINT, 30 VK_FORMAT_D24_UNORM_S8_UINT,
34 VK_FORMAT_D32_SFLOAT_S8_UINT, 31 VK_FORMAT_D32_SFLOAT_S8_UINT,
35 VkFormat{}, 32 VK_FORMAT_UNDEFINED,
36}; 33};
37
38} // namespace Alternatives 34} // namespace Alternatives
39 35
40constexpr std::array REQUIRED_EXTENSIONS{ 36constexpr std::array REQUIRED_EXTENSIONS{
@@ -63,9 +59,9 @@ void SetNext(void**& next, T& data) {
63constexpr const VkFormat* GetFormatAlternatives(VkFormat format) { 59constexpr const VkFormat* GetFormatAlternatives(VkFormat format) {
64 switch (format) { 60 switch (format) {
65 case VK_FORMAT_D24_UNORM_S8_UINT: 61 case VK_FORMAT_D24_UNORM_S8_UINT:
66 return Alternatives::Depth24UnormS8_UINT.data(); 62 return Alternatives::DEPTH24_UNORM_STENCIL8_UINT.data();
67 case VK_FORMAT_D16_UNORM_S8_UINT: 63 case VK_FORMAT_D16_UNORM_S8_UINT:
68 return Alternatives::Depth16UnormS8_UINT.data(); 64 return Alternatives::DEPTH16_UNORM_STENCIL8_UINT.data();
69 default: 65 default:
70 return nullptr; 66 return nullptr;
71 } 67 }