From 6672499ddee6aff04032509d667386ae94f1d31c Mon Sep 17 00:00:00 2001 From: Ani Date: Sat, 5 Aug 2023 22:49:32 +0100 Subject: [PATCH] vk: Fix detection of RADV on get_driver_vendor() Since Mesa 22.2.0 (2022-09-21), commit https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11027/diffs?commit_id=f06da59fd75d7ce7708d159753fcdbc11de16f9e, the deviceName property has included the name of the GPU, thus invalidating our previous method of detecting RADV as a driver vendor Before: "AMD RADV NAVY_FLOUNDER" After: "AMD Radeon RX 6700M (RADV NAVI22)" Before: "AMD RADV RENOIR" After: "AMD Radeon Graphics (RADV RENOIR)" --- rpcs3/Emu/RSX/VK/vkutils/device.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.cpp b/rpcs3/Emu/RSX/VK/vkutils/device.cpp index f2f1673d0c..885060b3e2 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/device.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/device.cpp @@ -255,6 +255,11 @@ namespace vk { const auto gpu_name = get_name(); + if (gpu_name.find("RADV") != umax) + { + return driver_vendor::RADV; + } + if (gpu_name.find("Radeon") != umax) { return driver_vendor::AMD; @@ -265,11 +270,6 @@ namespace vk return driver_vendor::NVIDIA; } - if (gpu_name.find("RADV") != umax) - { - return driver_vendor::RADV; - } - if (gpu_name.find("Intel") != umax) { #ifdef _WIN32