diff options
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_device.cpp | 26 | 
1 files changed, 20 insertions, 6 deletions
| diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 40b7ea90f..910e63a25 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -587,6 +587,26 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR              ext_extended_dynamic_state = false;          }      } + +    sets_per_pool = 64; +    if (driver_id == VK_DRIVER_ID_AMD_PROPRIETARY || driver_id == VK_DRIVER_ID_AMD_OPEN_SOURCE) { +        // AMD drivers need a higher amount of Sets per Pool in certain circunstances like in XC2. +        sets_per_pool = 96; +    } + +    const bool is_amd = driver_id == VK_DRIVER_ID_AMD_PROPRIETARY || +                        driver_id == VK_DRIVER_ID_MESA_RADV || +                        driver_id == VK_DRIVER_ID_AMD_OPEN_SOURCE; +    if (ext_sampler_filter_minmax && is_amd) { +        // Disable ext_sampler_filter_minmax on AMD GCN4 and lower as it is broken. +        if (!is_float16_supported) { +            LOG_WARNING( +                Render_Vulkan, +                "Blacklisting AMD GCN4 and lower for VK_EXT_SAMPLER_FILTER_MINMAX_EXTENSION_NAME"); +            ext_sampler_filter_minmax = false; +        } +    } +      if (ext_vertex_input_dynamic_state && driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS) {          LOG_WARNING(Render_Vulkan, "Blacklisting Intel for VK_EXT_vertex_input_dynamic_state");          ext_vertex_input_dynamic_state = false; @@ -599,12 +619,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR      graphics_queue = logical.GetQueue(graphics_family);      present_queue = logical.GetQueue(present_family); - -    sets_per_pool = 64; -    if (driver_id == VK_DRIVER_ID_AMD_PROPRIETARY || driver_id == VK_DRIVER_ID_AMD_OPEN_SOURCE) { -        // AMD drivers need a higher amount of Sets per Pool in certain circunstances like in XC2. -        sets_per_pool = 96; -    }  }  Device::~Device() = default; | 
