joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Windows SDL 1.x: Eliminate SDL Video quit/init hack when starting up with output=opengl

Browse Source
This commit is contained in:
Jonathan Campbell 2018-02-15 19:26:18 -08:00
parent 6a4e908fc4
commit 4cf9f01139
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/sdlmain.cpp
View File

@ -5529,38 +5529,6 @@ int main(int argc, char* argv[]) {
}
}
#if defined(WIN32) && !defined(C_SDL2)
if (sdl.desktop.want_type == SCREEN_OPENGL && sdl.using_windib) {
LOG(LOG_MISC,LOG_DEBUG)("Desktop wants SCREEN_OPENGL and we're using windib now. Reinitializing SDL video output.");
SDL_QuitSubSystem(SDL_INIT_VIDEO);
sdl.surface = NULL; // surface becomes invalid!
if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
E_Exit("Can't init SDL Video %s",SDL_GetError());
sdl.surface = SDL_SetVideoMode(640, 400, 0, SDL_RESIZABLE);
if (sdl.surface == NULL) E_Exit("Could not initialize video: %s", SDL_GetError());
sdl.deferred_resize = false;
sdl.must_redraw_all = true;
change_output(sdl.opengl.bilinear ? 3/*OpenGL*/ : 4/*OpenGLNB*/);
GFX_SetIcon();
SDL_Prepare();
void DOSBox_SetSysMenu(void);
DOSBox_SetSysMenu();
Section_prop *section = static_cast<Section_prop *>(control->GetSection("SDL"));
assert(section != NULL);
bool cfg_want_menu = section->Get_bool("showmenu");
if (menu.gui && !control->opt_nomenu && cfg_want_menu) {
NonUserResizeCounter=1;
DOSBox_SetMenu();
}
}
#endif
#if defined(WIN32) && !defined(C_SDL2)
{
Section_prop *sec = static_cast<Section_prop *>(control->GetSection("dosbox"));