From 3269b61ffc4d8122f306e3d4e99fff7d38fbd0dc Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Mon, 2 Dec 2019 09:43:06 -0500 Subject: [PATCH] - change menu option for 'vid_preferbackend' --- src/rendering/v_video.cpp | 16 +++++++++++++--- wadsrc/static/menudef.txt | 9 ++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/rendering/v_video.cpp b/src/rendering/v_video.cpp index 9beb8e36be..607503bfc4 100644 --- a/src/rendering/v_video.cpp +++ b/src/rendering/v_video.cpp @@ -114,9 +114,19 @@ CUSTOM_CVAR(Int, vid_preferbackend, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_N // yet - I'm pretty sure it's going to require a lot of reinits and destructions to // do it right without memory leaks - // 0 - OpenGL - // 1 - Vulkan - // 2 - SoftPoly v2 + switch(self) + { + case 2: + Printf("Selecting SoftPoly backend...\n"); + break; +#ifdef HAVE_VULKAN + case 1: + Printf("Selecting Vulkan backend...\n"); + break; +#endif + default: + Printf("Selecting OpenGL backend...\n"); + } Printf("Changing the video backend requires a restart for " GAMENAME ".\n"); } diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index d4d325e05f..c6e5a4b4be 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -885,6 +885,12 @@ OptionValue GPUSwitch 2.0, "$OPTVAL_INTEGRATED" } +OptionValue PreferBackend +{ + 0, "$OPTVAL_OPENGL" + 1, "$OPTVAL_VULKAN" + 2, "$OPTVAL_SOFTPOLY" +} OptionMenu "TrueColorOptions" protected { @@ -918,6 +924,8 @@ OptionMenu "VideoOptions" protected Submenu "$GLMNU_TEXOPT", "GLTextureGLOptions" Submenu "$GLMNU_DYNLIGHT", "GLLightOptions" StaticText " " + Option "$DSPLYMNU_PREFERBACKEND", "vid_preferbackend", "PreferBackend" + StaticText " " Slider "$DSPLYMNU_SCREENSIZE", "screenblocks", 3.0, 12.0, 1.0, 0 Slider "$DSPLYMNU_GAMMA", "Gamma", 0.75, 3.0, 0.05, 2 @@ -2787,7 +2795,6 @@ OptionMenu "vkoptions" StaticText "$VK_WARNING" StaticText "$VK_RESTART" StaticText "" - Option "$VKMNU_ENABLE", "vid_enablevulkan", "OnOff" TextField "$VKMNU_DEVICE", vk_device Option "$VKMNU_HDR", "vk_hdr", "OnOff" }