zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

sdlayer: don't add windowed modes that are larger than the monitor's actual resolution

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7115 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-10-25 23:32:00 +00:00
parent b16d7a412b
commit 5c1e350d79
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/build/src/sdlayer.cpp
View file

@ -1184,19 +1184,25 @@ void videoGetModes(void)
SDL_CHECKFSMODES(maxx, maxy); SDL_CHECKFSMODES(maxx, maxy);
// add windowed modes next // add windowed modes next
// SDL sorts display modes largest to smallest, so we can just compare with mode 0
// to make sure we aren't adding modes that are larger than the actual screen res
SDL_GetDisplayMode(0, 0, &dispmode);
for (i = 0; g_defaultVideoModes[i].x; i++) for (i = 0; g_defaultVideoModes[i].x; i++)
{ {
if (!SDL_CHECKMODE(g_defaultVideoModes[i].x, g_defaultVideoModes[i].y)) auto const &mode = g_defaultVideoModes[i];
if (mode.x > dispmode.w || mode.y > dispmode.h || !SDL_CHECKMODE(mode.x, mode.y))
continue; continue;
// HACK: 8-bit == Software, 32-bit == OpenGL // 8-bit == Software, 32-bit == OpenGL
SDL_ADDMODE(g_defaultVideoModes[i].x, g_defaultVideoModes[i].y, 8, 0); SDL_ADDMODE(mode.x, mode.y, 8, 0);
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (nogl) if (nogl)
continue; continue;
SDL_ADDMODE(g_defaultVideoModes[i].x, g_defaultVideoModes[i].y, 32, 0); SDL_ADDMODE(mode.x, mode.y, 32, 0);
#endif #endif
} }

5
source/build/src/sdlayer12.cpp
View file

@ -298,10 +298,11 @@ void videoGetModes(void)
for (i = 0; g_defaultVideoModes[i].x; i++) for (i = 0; g_defaultVideoModes[i].x; i++)
{ {
if (!SDL_CHECKMODE(g_defaultVideoModes[i].x, g_defaultVideoModes[i].y)) auto &mode = g_defaultVideoModes[i];
if (mode.x > maxx || mode.y > maxy || !SDL_CHECKMODE(mode.x, mode.y))
continue; continue;
SDL_ADDMODE(g_defaultVideoModes[i].x, g_defaultVideoModes[i].y, cdepths[j], 0); SDL_ADDMODE(mode.x, mode.y, cdepths[j], 0);
} }
} }