Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-09-09 01:26:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the fix for Bugzilla #1395 into WIN_GL_SetupWindow() directly.

Browse Source 
It's a cleaner solution.
This commit is contained in:
Ryan C. Gordon
2013-08-01 00:27:22 -04:00
parent e5aa1694db
commit 260c212fd0
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video/windows/SDL_windowsopengl.c
View File

@@ -418,8 +418,9 @@ WIN_GL_ChoosePixelFormatARB(_THIS, int *iAttribs, float *fAttribs)
return pixel_format;
}
int
WIN_GL_SetupWindow(_THIS, SDL_Window * window)
/* actual work of WIN_GL_SetupWindow() happens here. */
static int
WIN_GL_SetupWindowInternal(_THIS, SDL_Window * window)
{
HDC hdc = ((SDL_WindowData *) window->driverdata)->hdc;
PIXELFORMATDESCRIPTOR pfd;
@@ -529,6 +530,17 @@ WIN_GL_SetupWindow(_THIS, SDL_Window * window)
return 0;
}
int
WIN_GL_SetupWindow(_THIS, SDL_Window * window)
{
/* The current context is lost in here; save it and reset it. */
SDL_Window *current_win = SDL_GL_GetCurrentWindow();
SDL_GLContext current_ctx = SDL_GL_GetCurrentContext();
const int retval = WIN_GL_SetupWindowInternal(_this, window);
WIN_GL_MakeCurrent(_this, current_win, current_ctx);
return retval;
}
SDL_GLContext
WIN_GL_CreateContext(_THIS, SDL_Window * window)
{

5
src/video/windows/SDL_windowswindow.c
View File

@@ -231,15 +231,10 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
}
#if SDL_VIDEO_OPENGL_WGL
if (window->flags & SDL_WINDOW_OPENGL) {
/* The current context is lost in SDL_GL_SetupWindow; recover it. */
SDL_Window *current_win = SDL_GL_GetCurrentWindow();
SDL_GLContext current_ctx = SDL_GL_GetCurrentContext();
if (WIN_GL_SetupWindow(_this, window) < 0) {
WIN_DestroyWindow(_this, window);
WIN_GL_MakeCurrent(_this, current_win, current_ctx);
return -1;
}
WIN_GL_MakeCurrent(_this, current_win, current_ctx);
}
#endif
return 0;