octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vk_instance: Only check the portability extension on apple platforms

Browse Source
This commit is contained in:
GPUCode
2023-01-19 23:23:38 +02:00
parent ab73566acc
commit 9f385ddeb7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_core/renderer_vulkan/vk_instance.cpp
View File

@@ -488,8 +488,9 @@ bool Instance::CreateDevice() {
}; };
AddExtension(VK_KHR_SWAPCHAIN_EXTENSION_NAME); AddExtension(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
// According to the Vulkan spec, VK_KHR_portability_subset must be added if supported. #ifdef __APPLE__
bool portability_subset = AddExtension(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME); bool portability_subset = AddExtension(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME);
#endif
timeline_semaphores = AddExtension(VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME); timeline_semaphores = AddExtension(VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME);
extended_dynamic_state = AddExtension(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME); extended_dynamic_state = AddExtension(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME);
push_descriptors = AddExtension(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); push_descriptors = AddExtension(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
@@ -572,7 +573,9 @@ bool Instance::CreateDevice() {
.shaderClipDistance = features.shaderClipDistance, .shaderClipDistance = features.shaderClipDistance,
}, },
}, },
#ifdef __APPLE__
feature_chain.get<vk::PhysicalDevicePortabilitySubsetFeaturesKHR>(), feature_chain.get<vk::PhysicalDevicePortabilitySubsetFeaturesKHR>(),
#endif
vk::PhysicalDeviceTimelineSemaphoreFeaturesKHR{ vk::PhysicalDeviceTimelineSemaphoreFeaturesKHR{
.timelineSemaphore = true, .timelineSemaphore = true,
}, },
@@ -591,6 +594,7 @@ bool Instance::CreateDevice() {
}, },
}; };
#ifdef __APPLE__
if (portability_subset) { if (portability_subset) {
const vk::PhysicalDevicePortabilitySubsetFeaturesKHR portability_features = const vk::PhysicalDevicePortabilitySubsetFeaturesKHR portability_features =
feature_chain.get<vk::PhysicalDevicePortabilitySubsetFeaturesKHR>(); feature_chain.get<vk::PhysicalDevicePortabilitySubsetFeaturesKHR>();
@@ -605,6 +609,7 @@ bool Instance::CreateDevice() {
} else { } else {
device_chain.unlink<vk::PhysicalDevicePortabilitySubsetFeaturesKHR>(); device_chain.unlink<vk::PhysicalDevicePortabilitySubsetFeaturesKHR>();
} }
#endif
if (!index_type_uint8) { if (!index_type_uint8) {
device_chain.unlink<vk::PhysicalDeviceIndexTypeUint8FeaturesEXT>(); device_chain.unlink<vk::PhysicalDeviceIndexTypeUint8FeaturesEXT>();