H3cJP/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4614 from ReinUsesLisp/fix-extended-state-again

Browse Source 
vk_device: Fix driver id check on AMD for VK_EXT_extended_dynamic_state
This commit is contained in:
LC 2020-08-30 22:04:32 -04:00 committed by GitHub
commit 0090d3d087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;