zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 21:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- 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.

Browse source
This commit is contained in:
Rachael Alexanderson 2017-05-27 04:50:38 -04:00
parent b111a708da
commit 4545bb2fa1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/win32/hardware.cpp
View file

@ -99,7 +99,7 @@ CUSTOM_CVAR(Int, vid_gpuswitch, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINI
} }
// Software OpenGL canvas // 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) if ((self ? 1 : 0) != currentcanvas)
Printf("You must restart " GAMENAME " for this change to take effect.\n"); Printf("You must restart " GAMENAME " for this change to take effect.\n");
@ -177,7 +177,7 @@ void I_InitGraphics ()
val.Bool = !!Args->CheckParm ("-devparm"); val.Bool = !!Args->CheckParm ("-devparm");
ticker.SetGenericRepDefault (val, CVAR_Bool); 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) if (currentrenderer == 1)
Video = gl_CreateVideo(); Video = gl_CreateVideo();
else else
@ -201,14 +201,14 @@ static void I_DeleteRenderer()
void I_CreateRenderer() void I_CreateRenderer()
{ {
currentrenderer = vid_renderer; currentrenderer = vid_renderer;
currentcanvas = vid_used3d; currentcanvas = vid_glswfb;
if (currentrenderer == 1) if (currentrenderer == 1)
Printf("Renderer: OpenGL\n"); 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) 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"); Printf("Renderer: Software on DirectDraw\n");
else else
Printf("Renderer: Unknown\n"); Printf("Renderer: Unknown\n");