zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/coelckers/gzdoom

This commit is contained in:
Rachael Alexanderson 2017-05-27 21:52:43 -04:00
parent 872db304f0 9435a09f1e
commit 0fb1a0604c
4 changed files with 36 additions and 8 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");

6
wadsrc/static/compatibility.txt
View File

@ -488,6 +488,12 @@ F6EE16F770AD309D608EA0B1F1E249FC // Ultimate Doom, e4m3
{ {
setsectorspecial 147 0 setsectorspecial 147 0
} }
0D491365C1B88B7D1B603890100DD03E // doom2.wad map18
{
// missing textures
setwalltexture 451 front mid metal
setwalltexture 459 front mid metal
}
EBDAC00E9D25D884B2C8F4B1F0390539 // doom2.wad map21 EBDAC00E9D25D884B2C8F4B1F0390539 // doom2.wad map21
{ {
// push ceiling down in glitchy sectors above the stair switches // push ceiling down in glitchy sectors above the stair switches

2
wadsrc/static/language.enu
View File

@ -2361,6 +2361,8 @@ OPTVAL_EVERYTHING = "Everything";
OPTVAL_FULLSCREENONLY = "Fullscreen only"; OPTVAL_FULLSCREENONLY = "Fullscreen only";
OPTVAL_GL = "OpenGL"; OPTVAL_GL = "OpenGL";
OPTVAL_D3D = "Direct3D"; OPTVAL_D3D = "Direct3D";
OPTVAL_SDL = "SDL";
OPTVAL_COCOA = "Cocoa";
OPTVAL_HWPOLY = "OpenGL-Accelerated"; OPTVAL_HWPOLY = "OpenGL-Accelerated";
OPTVAL_SWDOOM = "Doom Software Renderer"; OPTVAL_SWDOOM = "Doom Software Renderer";
OPTVAL_DEDICATED = "High-Performance"; OPTVAL_DEDICATED = "High-Performance";

22
wadsrc/static/menudef.txt
View File

@ -1771,6 +1771,18 @@ OptionValue "GLD3D"
1, "$OPTVAL_GL" 1, "$OPTVAL_GL"
} }
OptionValue "GLSDL"
{
0, "$OPTVAL_SDL"
1, "$OPTVAL_GL"
}
OptionValue "GLCOCOA"
{
0, "$OPTVAL_COCOA"
1, "$OPTVAL_GL"
}
OptionMenu RendererMenu OptionMenu RendererMenu
{ {
Title "$RNDMNU_TITLE" Title "$RNDMNU_TITLE"
@ -1779,7 +1791,15 @@ OptionMenu RendererMenu
Option "$RNDMNU_POLY", "r_polyrenderer", "OnOff" Option "$RNDMNU_POLY", "r_polyrenderer", "OnOff"
IfOption(Windows) IfOption(Windows)
{ {
Option "$RNDMNU_CANVAS", "vid_used3d", "D3DGL" Option "$RNDMNU_CANVAS", "vid_glswfb", "GLD3D"
}
IfOption(unix)
{
Option "$RNDMNU_CANVAS", "vid_glswfb", "GLSDL"
}
IfOption(Mac)
{
Option "$RNDMNU_CANVAS", "vid_glswfb", "GLCOCOA"
} }
} }