summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/video_core/vulkan_common/vulkan_device.cpp8
-rw-r--r--src/video_core/vulkan_common/vulkan_device.h11
2 files changed, 0 insertions, 19 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index 3d2e9a16a..dcedf4425 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -783,9 +783,6 @@ bool Device::GetSuitability(bool requires_swapchain) {
783 783
784 FOR_EACH_VK_FEATURE_EXT(FEATURE_EXTENSION); 784 FOR_EACH_VK_FEATURE_EXT(FEATURE_EXTENSION);
785 FOR_EACH_VK_EXTENSION(EXTENSION); 785 FOR_EACH_VK_EXTENSION(EXTENSION);
786#ifdef _WIN32
787 FOR_EACH_VK_EXTENSION_WIN32(EXTENSION);
788#endif
789 786
790#undef FEATURE_EXTENSION 787#undef FEATURE_EXTENSION
791#undef EXTENSION 788#undef EXTENSION
@@ -804,11 +801,6 @@ bool Device::GetSuitability(bool requires_swapchain) {
804 801
805 FOR_EACH_VK_RECOMMENDED_EXTENSION(LOG_EXTENSION); 802 FOR_EACH_VK_RECOMMENDED_EXTENSION(LOG_EXTENSION);
806 FOR_EACH_VK_MANDATORY_EXTENSION(CHECK_EXTENSION); 803 FOR_EACH_VK_MANDATORY_EXTENSION(CHECK_EXTENSION);
807#ifdef _WIN32
808 FOR_EACH_VK_MANDATORY_EXTENSION_WIN32(CHECK_EXTENSION);
809#else
810 FOR_EACH_VK_MANDATORY_EXTENSION_GENERIC(CHECK_EXTENSION);
811#endif
812 804
813 if (requires_swapchain) { 805 if (requires_swapchain) {
814 CHECK_EXTENSION(VK_KHR_SWAPCHAIN_EXTENSION_NAME); 806 CHECK_EXTENSION(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h
index f314d0ffe..8c7e44fcb 100644
--- a/src/video_core/vulkan_common/vulkan_device.h
+++ b/src/video_core/vulkan_common/vulkan_device.h
@@ -68,7 +68,6 @@
68 EXTENSION(EXT, VERTEX_ATTRIBUTE_DIVISOR, vertex_attribute_divisor) \ 68 EXTENSION(EXT, VERTEX_ATTRIBUTE_DIVISOR, vertex_attribute_divisor) \
69 EXTENSION(KHR, DRAW_INDIRECT_COUNT, draw_indirect_count) \ 69 EXTENSION(KHR, DRAW_INDIRECT_COUNT, draw_indirect_count) \
70 EXTENSION(KHR, DRIVER_PROPERTIES, driver_properties) \ 70 EXTENSION(KHR, DRIVER_PROPERTIES, driver_properties) \
71 EXTENSION(KHR, EXTERNAL_MEMORY_FD, external_memory_fd) \
72 EXTENSION(KHR, PUSH_DESCRIPTOR, push_descriptor) \ 71 EXTENSION(KHR, PUSH_DESCRIPTOR, push_descriptor) \
73 EXTENSION(KHR, SAMPLER_MIRROR_CLAMP_TO_EDGE, sampler_mirror_clamp_to_edge) \ 72 EXTENSION(KHR, SAMPLER_MIRROR_CLAMP_TO_EDGE, sampler_mirror_clamp_to_edge) \
74 EXTENSION(KHR, SHADER_FLOAT_CONTROLS, shader_float_controls) \ 73 EXTENSION(KHR, SHADER_FLOAT_CONTROLS, shader_float_controls) \
@@ -80,9 +79,6 @@
80 EXTENSION(NV, VIEWPORT_ARRAY2, viewport_array2) \ 79 EXTENSION(NV, VIEWPORT_ARRAY2, viewport_array2) \
81 EXTENSION(NV, VIEWPORT_SWIZZLE, viewport_swizzle) 80 EXTENSION(NV, VIEWPORT_SWIZZLE, viewport_swizzle)
82 81
83#define FOR_EACH_VK_EXTENSION_WIN32(EXTENSION) \
84 EXTENSION(KHR, EXTERNAL_MEMORY_WIN32, external_memory_win32)
85
86// Define extensions which must be supported. 82// Define extensions which must be supported.
87#define FOR_EACH_VK_MANDATORY_EXTENSION(EXTENSION_NAME) \ 83#define FOR_EACH_VK_MANDATORY_EXTENSION(EXTENSION_NAME) \
88 EXTENSION_NAME(VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) \ 84 EXTENSION_NAME(VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) \
@@ -90,12 +86,6 @@
90 EXTENSION_NAME(VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME) \ 86 EXTENSION_NAME(VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME) \
91 EXTENSION_NAME(VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME) 87 EXTENSION_NAME(VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME)
92 88
93#define FOR_EACH_VK_MANDATORY_EXTENSION_GENERIC(EXTENSION_NAME) \
94 EXTENSION_NAME(VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)
95
96#define FOR_EACH_VK_MANDATORY_EXTENSION_WIN32(EXTENSION_NAME) \
97 EXTENSION_NAME(VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME)
98
99// Define extensions where the absence of the extension may result in a degraded experience. 89// Define extensions where the absence of the extension may result in a degraded experience.
100#define FOR_EACH_VK_RECOMMENDED_EXTENSION(EXTENSION_NAME) \ 90#define FOR_EACH_VK_RECOMMENDED_EXTENSION(EXTENSION_NAME) \
101 EXTENSION_NAME(VK_EXT_CONSERVATIVE_RASTERIZATION_EXTENSION_NAME) \ 91 EXTENSION_NAME(VK_EXT_CONSERVATIVE_RASTERIZATION_EXTENSION_NAME) \
@@ -636,7 +626,6 @@ private:
636 FOR_EACH_VK_FEATURE_1_3(FEATURE); 626 FOR_EACH_VK_FEATURE_1_3(FEATURE);
637 FOR_EACH_VK_FEATURE_EXT(FEATURE); 627 FOR_EACH_VK_FEATURE_EXT(FEATURE);
638 FOR_EACH_VK_EXTENSION(EXTENSION); 628 FOR_EACH_VK_EXTENSION(EXTENSION);
639 FOR_EACH_VK_EXTENSION_WIN32(EXTENSION);
640 629
641#undef EXTENSION 630#undef EXTENSION
642#undef FEATURE 631#undef FEATURE