From 2093c19127456b98e2df3978ee556864d2f4b515 Mon Sep 17 00:00:00 2001 From: lightningterror <18107717+lightningterror@users.noreply.github.com> Date: Sun, 16 Oct 2022 18:54:03 +0200 Subject: [PATCH] GS: Adjust default renderer for vendors on windows. AMD, feature level 12.0 and higher pick Vulkan by default. Intel, feature level 12.0 and higher, pick OpenGL by default. --- pcsx2/GS/Renderers/DX11/D3D.cpp | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pcsx2/GS/Renderers/DX11/D3D.cpp b/pcsx2/GS/Renderers/DX11/D3D.cpp index 8a89f727a8..9af1b7c227 100644 --- a/pcsx2/GS/Renderers/DX11/D3D.cpp +++ b/pcsx2/GS/Renderers/DX11/D3D.cpp @@ -109,8 +109,7 @@ namespace D3D D3D_FEATURE_LEVEL feature_level; static const D3D_FEATURE_LEVEL check[] = { - D3D_FEATURE_LEVEL_12_1, - D3D_FEATURE_LEVEL_11_1, + D3D_FEATURE_LEVEL_12_0, D3D_FEATURE_LEVEL_11_0, }; @@ -122,15 +121,25 @@ namespace D3D if (FAILED(hr)) return Renderer::Default; - if (Vendor() == VendorID::Nvidia) + switch (Vendor()) { - if (feature_level == D3D_FEATURE_LEVEL_12_1) - return Renderer::Vulkan; - else if (feature_level == D3D_FEATURE_LEVEL_11_0) - return Renderer::OpenGL; + case VendorID::Nvidia: + if (feature_level == D3D_FEATURE_LEVEL_12_0) + return Renderer::Vulkan; + else if (feature_level == D3D_FEATURE_LEVEL_11_0) + return Renderer::OpenGL; + [[fallthrough]]; + case VendorID::AMD: + if (feature_level == D3D_FEATURE_LEVEL_12_0) + return Renderer::Vulkan; + [[fallthrough]]; + case VendorID::Intel: + if (feature_level == D3D_FEATURE_LEVEL_12_0) + return Renderer::OpenGL; + [[fallthrough]]; + default: + // Default is D3D11 + return Renderer::Default; } - - // Default is D3D11 - return Renderer::Default; } }