From dc0fbe91521dff6c7c7b421b53eab7561eee2bd2 Mon Sep 17 00:00:00 2001 From: sonninnos <45124675+sonninnos@users.noreply.github.com> Date: Thu, 16 Nov 2023 19:40:45 +0200 Subject: [PATCH] (WIN32) D3D11 prefer correction (#15916) --- configuration.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configuration.c b/configuration.c index ead27b4f2a81..50304482f7c7 100644 --- a/configuration.c +++ b/configuration.c @@ -412,11 +412,8 @@ static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL; static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_METAL; #endif #endif -#elif defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP -/* Lets default to D3D11 in UWP, even when its compiled with ANGLE, since ANGLE is just calling D3D anyway.*/ -static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_D3D11; -#elif defined(HAVE_D3D11) && defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_WIN7 -/* Prefer D3D11 with Windows 7 and above. */ +#elif defined(HAVE_D3D11) || defined(__WINRT__) || (defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +/* Default to D3D11 in UWP, even when its compiled with ANGLE, since ANGLE is just calling D3D anyway.*/ static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_D3D11; #elif defined(HAVE_OPENGL1) && defined(_MSC_VER) && (_MSC_VER <= 1600) /* On Windows XP and earlier, use gl1 by default @@ -439,8 +436,6 @@ static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_WII; static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_WIIU; #elif defined(XENON) static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_XENON360; -#elif defined(HAVE_D3D11) -static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_D3D11; #elif defined(HAVE_D3D12) /* FIXME/WARNING: DX12 performance on Xbox is horrible for * some reason. For now, we will default to D3D11 when possible. */