yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-19 07:51:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix window handling when switch from gl to soft renderer.

Browse source 
Make sure that the window is destroyed at gl renderer shutdown and
recreated by the soft renderer. Don't deinitialize SDL in the
softrenderer, that's done by vid.c. And make sure that we start the soft
renderer with a clean GL state.
This commit is contained in:
Yamagi Burmeister 2018-08-10 12:19:15 +02:00
parent 9d4df05c22
commit be9942d516
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/client/refresh/soft/sw_main.c
View file

@ -2074,11 +2074,6 @@ SWimp_Shutdown( void )
{
SWimp_DestroyRender();
if (SDL_WasInit(SDL_INIT_EVERYTHING) == SDL_INIT_VIDEO)
SDL_Quit();
else
SDL_QuitSubSystem(SDL_INIT_VIDEO);
X11_active = false;
}

12
src/client/vid/glimp_sdl.c
View file

@ -185,6 +185,8 @@ GLimp_Init(void)
void
GLimp_Shutdown(void)
{
ShutdownGraphics();
if (SDL_WasInit(SDL_INIT_EVERYTHING) == SDL_INIT_VIDEO)
{
SDL_Quit();
@ -332,6 +334,16 @@ GLimp_InitGraphics(int fullscreen, int *pwidth, int *pheight)
return true;
}
/*
* Shuts the window down.
*/
void
GLimp_ShutdownGraphics(void)
{
SDL_GL_ResetAttributes();
ShutdownGraphics();
}
/*
* (Un)grab Input
*/

1
src/client/vid/header/vid.h
View file

@ -58,6 +58,7 @@ extern int glimp_refreshRate;
qboolean GLimp_Init(void);
void GLimp_Shutdown(void);
qboolean GLimp_InitGraphics(int fullscreen, int *pwidth, int *pheight);
void GLimp_ShutdownGraphics(void);
void GLimp_GrabInput(qboolean grab);
int GLimp_GetRefreshRate(void);

1
src/client/vid/vid.c
View file

@ -337,6 +337,7 @@ VID_ShutdownRenderer(void)
{
/* Shut down the renderer */
re.Shutdown();
GLimp_ShutdownGraphics();
Sys_FreeLibrary(reflib_handle);
reflib_handle = NULL;
memset(&re, 0, sizeof(re));