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

vk_instance: Blacklist broken extensions on newer qualcomm/arm drivers

Browse Source
This commit is contained in:
GPUCode
2023-03-25 09:11:51 +02:00
parent d2b719ac5a
commit 8e05af4389
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <set>
#include <span> #include <span>
#include "common/assert.h" #include "common/assert.h"
#include "common/settings.h" #include "common/settings.h"
@@ -623,22 +624,29 @@ bool Instance::CreateDevice() {
return false; return false;
} }
std::array<const char*, 12> enabled_extensions; std::vector<const char*> enabled_extensions;
u32 enabled_extension_count = 0; const auto AddExtension = [&](std::string_view extension, bool blacklist = false,
const auto AddExtension = [&](std::string_view extension) -> bool { std::string_view reason = "") -> bool {
auto result = std::find_if(available_extensions.begin(), available_extensions.end(), auto result = std::find_if(available_extensions.begin(), available_extensions.end(),
[&](const std::string& name) { return name == extension; }); [&](const std::string& name) { return name == extension; });
if (result != available_extensions.end()) { if (result != available_extensions.end() && !blacklist) {
LOG_INFO(Render_Vulkan, "Enabling extension: {}", extension); LOG_INFO(Render_Vulkan, "Enabling extension: {}", extension);
enabled_extensions[enabled_extension_count++] = extension.data(); enabled_extensions.push_back(extension.data());
return true; return true;
} else if (blacklist) {
LOG_WARNING(Render_Vulkan, "Extension {} has been blacklisted because {}", extension,
reason);
} }
LOG_WARNING(Render_Vulkan, "Extension {} unavailable.", extension); LOG_WARNING(Render_Vulkan, "Extension {} unavailable.", extension);
return false; return false;
}; };
const bool is_arm = driver_id == vk::DriverIdKHR::eArmProprietary;
const bool is_qualcomm = driver_id == vk::DriverIdKHR::eQualcommProprietary;
const bool is_radv = driver_id == vk::DriverIdKHR::eMesaRadv;
AddExtension(VK_KHR_SWAPCHAIN_EXTENSION_NAME); AddExtension(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
timeline_semaphores = AddExtension(VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME); timeline_semaphores = AddExtension(VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME);
image_format_list = AddExtension(VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME); image_format_list = AddExtension(VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME);
@@ -646,9 +654,14 @@ bool Instance::CreateDevice() {
shader_stencil_export = AddExtension(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME); shader_stencil_export = AddExtension(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME);
bool has_portability_subset = AddExtension(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME); bool has_portability_subset = AddExtension(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME);
bool has_dynamic_rendering = AddExtension(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME); bool has_dynamic_rendering = AddExtension(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME);
bool has_extended_dynamic_state = AddExtension(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME); bool has_extended_dynamic_state =
bool has_extended_dynamic_state2 = AddExtension(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME); AddExtension(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME, is_arm || is_qualcomm,
bool has_extended_dynamic_state3 = AddExtension(VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME); "it is broken on Qualcomm and ARM drivers");
bool has_extended_dynamic_state2 =
AddExtension(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME, is_qualcomm,
"it is broken on Qualcomm drivers");
bool has_extended_dynamic_state3 = AddExtension(VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME,
is_radv, "it is broken on RADV drivers");
bool has_custom_border_color = AddExtension(VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME); bool has_custom_border_color = AddExtension(VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME);
bool has_index_type_uint8 = AddExtension(VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME); bool has_index_type_uint8 = AddExtension(VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME);
bool has_pipeline_creation_cache_control = bool has_pipeline_creation_cache_control =
@@ -710,7 +723,7 @@ bool Instance::CreateDevice() {
vk::DeviceCreateInfo{ vk::DeviceCreateInfo{
.queueCreateInfoCount = queue_count, .queueCreateInfoCount = queue_count,
.pQueueCreateInfos = queue_infos.data(), .pQueueCreateInfos = queue_infos.data(),
.enabledExtensionCount = enabled_extension_count, .enabledExtensionCount = static_cast<u32>(enabled_extensions.size()),
.ppEnabledExtensionNames = enabled_extensions.data(), .ppEnabledExtensionNames = enabled_extensions.data(),
}, },
vk::PhysicalDeviceFeatures2{ vk::PhysicalDeviceFeatures2{