Merge branch 'setrenderneeded-fix' into 'master'

Clear setrenderneeded after calling VID_CheckRenderer

See merge request STJr/SRB2!793
This commit is contained in:
James R 2020-02-18 21:53:14 -05:00
commit c1a91cdc2e
2 changed files with 3 additions and 2 deletions

View File

@ -1286,12 +1286,14 @@ void D_SRB2Main(void)
// Lactozilla: Does the render mode need to change? // Lactozilla: Does the render mode need to change?
if ((setrenderneeded != 0) && (setrenderneeded != rendermode)) if ((setrenderneeded != 0) && (setrenderneeded != rendermode))
{ {
CONS_Printf("Switching the renderer...\n");
needpatchflush = true; needpatchflush = true;
needpatchrecache = true; needpatchrecache = true;
VID_CheckRenderer(); VID_CheckRenderer();
SCR_ChangeRendererCVars(setrenderneeded); SCR_ChangeRendererCVars(setrenderneeded);
}
D_CheckRendererState(); D_CheckRendererState();
setrenderneeded = 0;
}
wipegamestate = gamestate; wipegamestate = gamestate;

View File

@ -1499,7 +1499,6 @@ void VID_CheckRenderer(void)
{ {
I_StartupHardwareGraphics(); I_StartupHardwareGraphics();
R_InitHardwareMode(); R_InitHardwareMode();
HWR_Switch();
} }
#endif #endif
} }