From 4545bb2fa1000507e382144af35579029542ec4c Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 27 May 2017 04:50:38 -0400 Subject: [PATCH] - rename vid_used3d on windows to vid_glswfb to match Linux. Additionally, the values were reversed to match the Linux variant of this configuration. This CVar now operates exactly the same way it does on Linux, except it defaults to being off and still allows the D3D framebuffer on Windows when it's deactivated. --- src/win32/hardware.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/win32/hardware.cpp b/src/win32/hardware.cpp index 7121738f4..5ca3226c2 100644 --- a/src/win32/hardware.cpp +++ b/src/win32/hardware.cpp @@ -99,7 +99,7 @@ CUSTOM_CVAR(Int, vid_gpuswitch, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINI } // Software OpenGL canvas -CUSTOM_CVAR(Bool, vid_used3d, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) +CUSTOM_CVAR(Bool, vid_glswfb, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) { if ((self ? 1 : 0) != currentcanvas) Printf("You must restart " GAMENAME " for this change to take effect.\n"); @@ -177,7 +177,7 @@ void I_InitGraphics () val.Bool = !!Args->CheckParm ("-devparm"); ticker.SetGenericRepDefault (val, CVAR_Bool); - if (currentcanvas == 1) // Software Canvas: 1 = D3D or DirectDraw, 0 = OpenGL + if (currentcanvas == 0) // Software Canvas: 0 = D3D or DirectDraw, 1 = OpenGL if (currentrenderer == 1) Video = gl_CreateVideo(); else @@ -201,14 +201,14 @@ static void I_DeleteRenderer() void I_CreateRenderer() { currentrenderer = vid_renderer; - currentcanvas = vid_used3d; + currentcanvas = vid_glswfb; if (currentrenderer == 1) Printf("Renderer: OpenGL\n"); - else if (currentcanvas == 0) - Printf("Renderer: Software on OpenGL\n"); - else if (currentcanvas == 1 && vid_forceddraw == false) - Printf("Renderer: Software on Direct3D\n"); else if (currentcanvas == 1) + Printf("Renderer: Software on OpenGL\n"); + else if (currentcanvas == 0 && vid_forceddraw == false) + Printf("Renderer: Software on Direct3D\n"); + else if (currentcanvas == 0) Printf("Renderer: Software on DirectDraw\n"); else Printf("Renderer: Unknown\n");