From 4545bb2fa1000507e382144af35579029542ec4c Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 27 May 2017 04:50:38 -0400 Subject: [PATCH 1/5] - 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 7121738f4c..5ca3226c27 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"); From 9ebf1ec9a23dc8af65657338fa205da65b010c0d Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 27 May 2017 04:58:48 -0400 Subject: [PATCH 2/5] - Update menu to match new vid_glswfb config - Added vid_glswfb to menu on Linux --- wadsrc/static/language.enu | 1 + wadsrc/static/menudef.txt | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index 6d789497e8..4bb6c6d7d2 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -2361,6 +2361,7 @@ OPTVAL_EVERYTHING = "Everything"; OPTVAL_FULLSCREENONLY = "Fullscreen only"; OPTVAL_GL = "OpenGL"; OPTVAL_D3D = "Direct3D"; +OPTVAL_SDL = "SDL"; OPTVAL_HWPOLY = "OpenGL-Accelerated"; OPTVAL_SWDOOM = "Doom Software Renderer"; OPTVAL_DEDICATED = "High-Performance"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 4f300be086..ef5ce05ee5 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -1771,6 +1771,12 @@ OptionValue "GLD3D" 1, "$OPTVAL_GL" } +OptionValue "GLSDL" +{ + 0, "$OPTVAL_SDL" + 1, "$OPTVAL_GL" +} + OptionMenu RendererMenu { Title "$RNDMNU_TITLE" @@ -1779,7 +1785,11 @@ OptionMenu RendererMenu Option "$RNDMNU_POLY", "r_polyrenderer", "OnOff" IfOption(Windows) { - Option "$RNDMNU_CANVAS", "vid_used3d", "D3DGL" + Option "$RNDMNU_CANVAS", "vid_glswfb", "GLD3D" + } + IfOption(Linux) + { + Option "$RNDMNU_CANVAS", "vid_glswfb", "GLSDL" } } From a7cc6fb1ba05cc8701fa50e2c6160b10c3f7d79f Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 27 May 2017 05:12:59 -0400 Subject: [PATCH 3/5] - fixed: 'IfOption(Linux)' is actually 'IfOption(unix)' in menudef --- wadsrc/static/menudef.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index ef5ce05ee5..e0d58376a4 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -1787,7 +1787,7 @@ OptionMenu RendererMenu { Option "$RNDMNU_CANVAS", "vid_glswfb", "GLD3D" } - IfOption(Linux) + IfOption(unix) { Option "$RNDMNU_CANVAS", "vid_glswfb", "GLSDL" } From d0c1dc9b021925600052378796b414b54b884f41 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 27 May 2017 06:53:25 -0400 Subject: [PATCH 4/5] - Added compatibility fix for Doom2's map18 for missing textures on one of the door frames - lines 451 and 459 --- wadsrc/static/compatibility.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wadsrc/static/compatibility.txt b/wadsrc/static/compatibility.txt index 4c9576e185..621c4920e9 100644 --- a/wadsrc/static/compatibility.txt +++ b/wadsrc/static/compatibility.txt @@ -488,6 +488,12 @@ F6EE16F770AD309D608EA0B1F1E249FC // Ultimate Doom, e4m3 { setsectorspecial 147 0 } +0D491365C1B88B7D1B603890100DD03E // doom2.wad map18 +{ + // missing textures + setwalltexture 451 front mid metal + setwalltexture 459 front mid metal +} EBDAC00E9D25D884B2C8F4B1F0390539 // doom2.wad map21 { // push ceiling down in glitchy sectors above the stair switches From 9435a09f1ed178cd62382e05783d653e2967c843 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 27 May 2017 08:01:56 -0400 Subject: [PATCH 5/5] - Added vid_glswfb to menu on Mac. --- wadsrc/static/language.enu | 1 + wadsrc/static/menudef.txt | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index 4bb6c6d7d2..f12fab5517 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -2362,6 +2362,7 @@ OPTVAL_FULLSCREENONLY = "Fullscreen only"; OPTVAL_GL = "OpenGL"; OPTVAL_D3D = "Direct3D"; OPTVAL_SDL = "SDL"; +OPTVAL_COCOA = "Cocoa"; OPTVAL_HWPOLY = "OpenGL-Accelerated"; OPTVAL_SWDOOM = "Doom Software Renderer"; OPTVAL_DEDICATED = "High-Performance"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index e0d58376a4..e27c98a294 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -1777,6 +1777,12 @@ OptionValue "GLSDL" 1, "$OPTVAL_GL" } +OptionValue "GLCOCOA" +{ + 0, "$OPTVAL_COCOA" + 1, "$OPTVAL_GL" +} + OptionMenu RendererMenu { Title "$RNDMNU_TITLE" @@ -1791,6 +1797,10 @@ OptionMenu RendererMenu { Option "$RNDMNU_CANVAS", "vid_glswfb", "GLSDL" } + IfOption(Mac) + { + Option "$RNDMNU_CANVAS", "vid_glswfb", "GLCOCOA" + } } /*=======================================