OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit 'refs/pull/122/head' of https://github.com/coelckers/gzdoom

Browse source 
# Conflicts:
#	src/posix/cocoa/i_video.mm
#	src/posix/sdl/hardware.cpp
#	src/win32/hardware.cpp
This commit is contained in:
Rachael Alexanderson 2016-11-16 01:03:32 -05:00
commit 71b4f57058
7 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/win32/hardware.cpp
View file

@ -81,7 +81,7 @@ CUSTOM_CVAR(Bool, vid_used3d, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOIN
}
// [ZDoomGL]
CUSTOM_CVAR (Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
CUSTOM_CVAR (Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL | CVAR_OVERRIDEGET)
{
// 0: Software renderer
// 1: OpenGL renderer