Skip to content

Commit

Permalink
Never consider non-RT renderers
Browse files Browse the repository at this point in the history
  • Loading branch information
vs-shirokii committed Dec 23, 2023
1 parent 22dc8a1 commit ef32272
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
11 changes: 4 additions & 7 deletions src/common/platform/win32/hardware.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ void I_InitGraphics ()
// are the active app. Huh?
}

#if !HAVE_RT
#ifdef HAVE_VULKAN
if (V_GetBackend() == 1)
{
Expand All @@ -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)
Expand Down
6 changes: 1 addition & 5 deletions src/common/rendering/v_video.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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");
Expand Down

0 comments on commit ef32272

Please sign in to comment.