mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 03:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "windows: Use wglSwapLayerBuffers if available."

Browse Source 
This reverts commit b8ee44ca6a.

This is reverting a cherry-pick. It's probably too risky for a 3.2.x release,
but we'll let it marinate on main, for 3.4.0.
This commit is contained in:
Ryan C. Gordon
2025-07-11 18:25:14 -04:00
parent 9995174e68
commit 4e34c771e4
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,9 +141,6 @@ bool WIN_GL_LoadLibrary(SDL_VideoDevice *_this, const char *path)
SDL_LoadFunction(handle, "wglMakeCurrent"); SDL_LoadFunction(handle, "wglMakeCurrent");
_this->gl_data->wglShareLists = (BOOL (WINAPI *)(HGLRC, HGLRC)) _this->gl_data->wglShareLists = (BOOL (WINAPI *)(HGLRC, HGLRC))
SDL_LoadFunction(handle, "wglShareLists"); SDL_LoadFunction(handle, "wglShareLists");
_this->gl_data->wglSwapLayerBuffers = (BOOL (WINAPI *)(HDC, UINT))
SDL_LoadFunction(handle, "wglSwapLayerBuffers");
/* *INDENT-ON* */ // clang-format on /* *INDENT-ON* */ // clang-format on
#if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES) #if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)
@@ -889,15 +886,9 @@ bool WIN_GL_SwapWindow(SDL_VideoDevice *_this, SDL_Window *window)
{ {
HDC hdc = window->internal->hdc; HDC hdc = window->internal->hdc;
if (_this->gl_data->wglSwapLayerBuffers) {
if (!_this->gl_data->wglSwapLayerBuffers(hdc, WGL_SWAP_MAIN_PLANE)) {
return WIN_SetError("wglSwapLayerBuffers()");
}
} else {
if (!SwapBuffers(hdc)) { if (!SwapBuffers(hdc)) {
return WIN_SetError("SwapBuffers()"); return WIN_SetError("SwapBuffers()");
} }
}
return true; return true;
} }

2
src/video/windows/SDL_windowsopengl.h
View File

@@ -85,8 +85,6 @@ struct SDL_GLDriverData
BOOL (WINAPI *wglGetPixelFormatAttribivARB)(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); BOOL (WINAPI *wglGetPixelFormatAttribivARB)(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
BOOL (WINAPI *wglSwapIntervalEXT)(int interval); BOOL (WINAPI *wglSwapIntervalEXT)(int interval);
int (WINAPI *wglGetSwapIntervalEXT)(void); int (WINAPI *wglGetSwapIntervalEXT)(void);
BOOL (WINAPI *wglSwapLayerBuffers)(HDC hdc, UINT flags);
#if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES) #if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)
BOOL (WINAPI *wglSwapBuffers)(HDC hdc); BOOL (WINAPI *wglSwapBuffers)(HDC hdc);
int (WINAPI *wglDescribePixelFormat)(HDC hdc, int (WINAPI *wglDescribePixelFormat)(HDC hdc,