lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-27 14:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk_device: Fix driver id check on AMD for VK_EXT_extended_dynamic_state

Browse source 
'driver_id' can only be known on Vulkan 1.1 after creating a logical
device. Move the driver id check to disable
VK_EXT_extended_dynamic_state after the logical device is successfully
initialized.

The Vulkan device will have the extension enabled but it will not be
used.
This commit is contained in:
ReinUsesLisp 2020-08-30 20:22:48 -03:00
parent e9b9fc4674
commit c573920c01
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/video_core/renderer_vulkan/vk_device.cpp
View file

@ -380,6 +380,14 @@ bool VKDevice::Create() {
CollectTelemetryParameters(); CollectTelemetryParameters();
if (ext_extended_dynamic_state && driver_id == VK_DRIVER_ID_AMD_PROPRIETARY_KHR) {
// AMD's proprietary driver supports VK_EXT_extended_dynamic_state but the <stride> field
// seems to be bugged. Blacklisting it for now.
LOG_WARNING(Render_Vulkan,
"Blacklisting AMD proprietary from VK_EXT_extended_dynamic_state");
ext_extended_dynamic_state = false;
}
graphics_queue = logical.GetQueue(graphics_family); graphics_queue = logical.GetQueue(graphics_family);
present_queue = logical.GetQueue(present_family); present_queue = logical.GetQueue(present_family);
@ -691,12 +699,7 @@ std::vector<const char*> VKDevice::LoadExtensions() {
} }
} }
if (has_ext_extended_dynamic_state && driver_id == VK_DRIVER_ID_AMD_PROPRIETARY) { if (has_ext_extended_dynamic_state) {
// AMD's proprietary driver supports VK_EXT_extended_dynamic_state but the <stride> field
// seems to be bugged. Blacklisting it for now.
LOG_WARNING(Render_Vulkan,
"Blacklisting AMD proprietary from VK_EXT_extended_dynamic_state");
} else if (has_ext_extended_dynamic_state) {
VkPhysicalDeviceExtendedDynamicStateFeaturesEXT dynamic_state; VkPhysicalDeviceExtendedDynamicStateFeaturesEXT dynamic_state;
dynamic_state.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT; dynamic_state.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT;
dynamic_state.pNext = nullptr; dynamic_state.pNext = nullptr;