zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up fallback video mode attempt code in order to fix at least three bugs.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5758 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-05-29 21:11:17 +00:00
parent 225f37f7b0
commit 3719146448
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
polymer/eduke32/source/game.c
View file

@ -6406,38 +6406,33 @@ int32_t app_main(int32_t argc, char const * const * argv)
if (setgamemode(ud.config.ScreenMode,ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP) < 0) if (setgamemode(ud.config.ScreenMode,ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP) < 0)
{ {
int32_t i = 0; int32_t i = 0;
int32_t j = 0;
int32_t xres[] = {ud.config.ScreenWidth,800,640,320}; int32_t xres[] = {ud.config.ScreenWidth,800,640,320};
int32_t yres[] = {ud.config.ScreenHeight,600,480,240}; int32_t yres[] = {ud.config.ScreenHeight,600,480,240};
#ifdef USE_OPENGL
int32_t bpp[] = {32,16,8}; int32_t bpp[] = {32,16,8};
#else
int32_t bpp[] = {8};
#endif
initprintf("Failure setting video mode %dx%dx%d %s! Attempting safer mode...\n", initprintf("Failure setting video mode %dx%dx%d %s! Attempting safer mode...\n",
ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP,ud.config.ScreenMode?"fullscreen":"windowed"); ud.config.ScreenWidth,ud.config.ScreenHeight,ud.config.ScreenBPP,ud.config.ScreenMode?"fullscreen":"windowed");
#ifdef USE_OPENGL
{
int32_t j = 0;
while (setgamemode(0,xres[i],yres[i],bpp[j]) < 0) while (setgamemode(0,xres[i],yres[i],bpp[j]) < 0)
{ {
initprintf("Failure setting video mode %dx%dx%d windowed! Attempting safer mode...\n",xres[i],yres[i],bpp[i]); initprintf("Failure setting video mode %dx%dx%d windowed! Attempting safer mode...\n",xres[i],yres[i],bpp[j]);
if (++j == 3) if (++j == ARRAY_SIZE(bpp))
{ {
if (++i == 4) if (++i == ARRAY_SIZE(xres))
G_GameExit("Unable to set failsafe video mode!"); G_GameExit("Unable to set failsafe video mode!");
j = 0; j = 0;
} }
} }
}
#else
while (setgamemode(0,xres[i],yres[i],8) < 0)
{
initprintf("Failure setting video mode %dx%dx%d windowed! Attempting safer mode...\n",xres[i],yres[i],8);
i++;
}
#endif
ud.config.ScreenWidth = xres[i]; ud.config.ScreenWidth = xres[i];
ud.config.ScreenHeight = yres[i]; ud.config.ScreenHeight = yres[i];
ud.config.ScreenBPP = bpp[i]; ud.config.ScreenBPP = bpp[j];
} }
setbrightness(ud.brightness>>2,g_player[myconnectindex].ps->palette,0); setbrightness(ud.brightness>>2,g_player[myconnectindex].ps->palette,0);