From ef32272b2ed3fb377299f5ec2eece48dea6e99b6 Mon Sep 17 00:00:00 2001
From: Vasilii Shirokii <vs.shirokii@gmail.com>
Date: Sat, 23 Dec 2023 10:31:00 +0000
Subject: [PATCH] Never consider non-RT renderers

---
 src/common/platform/win32/hardware.cpp | 11 ++++-------
 src/common/rendering/v_video.cpp       |  6 +-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/common/platform/win32/hardware.cpp b/src/common/platform/win32/hardware.cpp
index d6f3043fdc..161b8b17f3 100644
--- a/src/common/platform/win32/hardware.cpp
+++ b/src/common/platform/win32/hardware.cpp
@@ -93,6 +93,7 @@ void I_InitGraphics ()
 		// are the active app. Huh?
 	}
 
+#if !HAVE_RT
 #ifdef HAVE_VULKAN
 	if (V_GetBackend() == 1)
 	{
@@ -108,17 +109,13 @@ void I_InitGraphics ()
 		}
 	}
 	else
-#endif
-#if HAVE_RT
-	if (V_GetBackend() == 0)
-	{
-		Video = new Win32RTVideo();
-	}
-	else
 #endif
 	{
 		Video = new Win32GLVideo();
 	}
+#else
+	Video = new Win32RTVideo();
+#endif
 
 	// we somehow STILL don't have a display!!
 	if (Video == NULL)
diff --git a/src/common/rendering/v_video.cpp b/src/common/rendering/v_video.cpp
index 80e8ff81b4..ef3236418f 100644
--- a/src/common/rendering/v_video.cpp
+++ b/src/common/rendering/v_video.cpp
@@ -97,11 +97,7 @@ CUSTOM_CVAR(Int, vid_maxfps, 1000, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 	}
 }
 
-#if !HAVE_RT
 CUSTOM_CVAR(Int, vid_preferbackend, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
-#else
-CUSTOM_CVAR(Int, vid_preferbackend, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
-#endif
 {
 	// [SP] This may seem pointless - but I don't want to implement live switching just
 	// yet - I'm pretty sure it's going to require a lot of reinits and destructions to
@@ -126,7 +122,7 @@ CUSTOM_CVAR(Int, vid_preferbackend, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_N
 		Printf("Selecting OpenGL backend...\n");
 	}
 #else
-	Printf(self == 0 ? "Selecting RayTracing backend...\n" : "Selecting OpenGL backend...\n");
+	Printf("Selecting RayTracing backend...\n");
 #endif
 
 	Printf("Changing the video backend requires a restart for " GAMENAME ".\n");