yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-23 04:52:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

VID: Implement a fallback when MSAA is not supported.

Browse source
This commit is contained in:
svdijk 2014-04-16 21:51:36 +02:00
parent ec8edb5d3b
commit d089159ab9
1 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/backends/sdl/refresh.c
View file

@ -503,14 +503,12 @@ static void RestoreGamma()
static qboolean static qboolean
GLimp_InitGraphics(qboolean fullscreen) GLimp_InitGraphics(qboolean fullscreen)
{ {
int counter = 0;
int flags; int flags;
int msaa_samples; int msaa_samples;
int stencil_bits; int stencil_bits;
int width, height; int width, height;
char title[24]; char title[24];
if (GetWindowSize(&width, &height) && (width == vid.width) && (height == vid.height)) if (GetWindowSize(&width, &height) && (width == vid.width) && (height == vid.height))
{ {
/* If we want fullscreen, but aren't */ /* If we want fullscreen, but aren't */
@ -555,11 +553,15 @@ GLimp_InitGraphics(qboolean fullscreen)
{ {
Com_Printf("MSAA is unsupported: %s\n", SDL_GetError()); Com_Printf("MSAA is unsupported: %s\n", SDL_GetError());
Cvar_SetValue ("gl_msaa_samples", 0); Cvar_SetValue ("gl_msaa_samples", 0);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
} }
else if (SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, msaa_samples) == -1) else if (SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, msaa_samples) == -1)
{ {
Com_Printf("%i MSAA are unsupported: %s\n", msaa_samples, SDL_GetError()); Com_Printf("MSAA %ix is unsupported: %s\n", msaa_samples, SDL_GetError());
Cvar_SetValue("gl_msaa_samples", 0); Cvar_SetValue("gl_msaa_samples", 0);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
} }
} }
@ -586,12 +588,20 @@ GLimp_InitGraphics(qboolean fullscreen)
{ {
if (!CreateSDLWindow(flags)) if (!CreateSDLWindow(flags))
{ {
if (counter == 1) if (gl_msaa_samples->value)
{ {
VID_Error(ERR_FATAL, "Failed to revert to gl_mode 4. Exiting...\n"); VID_Printf(PRINT_ALL, "SDL SetVideoMode failed: %s\n",
return false; SDL_GetError());
} VID_Printf(PRINT_ALL, "Reverting to gl_mode %i (%ix%i) without MSAA.\n",
(int)Cvar_VariableValue("gl_mode"), vid.width, vid.height);
/* Try to recover */
Cvar_SetValue("gl_msaa_samples", 0);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
}
else if (vid.width != 640 || vid.height != 480 || (flags & SDL_FULLSCREEN))
{
VID_Printf(PRINT_ALL, "SDL SetVideoMode failed: %s\n", VID_Printf(PRINT_ALL, "SDL SetVideoMode failed: %s\n",
SDL_GetError()); SDL_GetError());
VID_Printf(PRINT_ALL, "Reverting to gl_mode 4 (640x480) and windowed mode.\n"); VID_Printf(PRINT_ALL, "Reverting to gl_mode 4 (640x480) and windowed mode.\n");
@ -599,11 +609,15 @@ GLimp_InitGraphics(qboolean fullscreen)
/* Try to recover */ /* Try to recover */
Cvar_SetValue("gl_mode", 4); Cvar_SetValue("gl_mode", 4);
Cvar_SetValue("vid_fullscreen", 0); Cvar_SetValue("vid_fullscreen", 0);
flags &= ~SDL_FULLSCREEN;
vid.width = 640; vid.width = 640;
vid.height = 480; vid.height = 480;
}
counter++; else
continue; {
VID_Error(ERR_FATAL, "Failed to revert to gl_mode 4. Exiting...\n");
return false;
}
} }
else else
{ {