Merge remote-tracking branch 'origin/master' into polybackend

This commit is contained in:
Magnus Norddahl 2019-12-01 20:09:19 +01:00
commit 4a25c9f69b
658 changed files with 75029 additions and 68704 deletions

View file

@ -50,7 +50,6 @@
#include "doomerrors.h"
#include "i_system.h"
#include "swrenderer/r_swrenderer.h"
#include "atterm.h"
EXTERN_CVAR(Int, vid_enablevulkan)
@ -157,5 +156,4 @@ void I_InitGraphics ()
if (Video == NULL)
I_FatalError ("Failed to initialize display");
atterm (I_ShutdownGraphics);
}