Merge branch 'gl_swframebuffer' into qzdoom

This commit is contained in:
Magnus Norddahl 2016-11-23 00:56:39 +01:00
commit f313bfd2cc
2 changed files with 11 additions and 2 deletions

View file

@ -56,6 +56,8 @@ EXTERN_CVAR (Bool, fullscreen)
EXTERN_CVAR (Bool, swtruecolor)
EXTERN_CVAR (Float, vid_winscale)
CVAR (Bool, vid_sdl, 0, 0);
IVideo *Video;
extern int NewWidth, NewHeight, NewBits, DisplayBits;
@ -120,7 +122,7 @@ void I_InitGraphics ()
ticker.SetGenericRepDefault (val, CVAR_Bool);
//currentrenderer = vid_renderer;
if (currentrenderer==1) Video = new SDLGLVideo(0);
if (currentrenderer==1 || vid_sdl==0) Video = new SDLGLVideo(0);
else Video = new SDLVideo (0);
if (Video == NULL)