Skip to content

Commit 0f695ad

Browse files
committed
Reapply "wayland: Don't initialize OpenGL when the window flags didn't specify it"
This reverts commit 120b8d4. The issue this was patching over in Vanilla-Conquer was the lack of an exposure event when showing a window, which has since been remedied. Attaching EGL window objects can also cause protocol violations now that the explicit sync protocol is in use, if SDL creates one and then the client tries to attach one itself, so they really shouldn't be created unless the client specifically requested it. (cherry picked from commit 643437f)
1 parent 79ec168 commit 0f695ad

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

src/video/wayland/SDL_waylandwindow.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1999,13 +1999,6 @@ int Wayland_CreateWindow(_THIS, SDL_Window *window)
19991999
c = _this->driverdata;
20002000
window->driverdata = data;
20012001

2002-
if (!(window->flags & SDL_WINDOW_VULKAN)) {
2003-
if (!(window->flags & SDL_WINDOW_OPENGL)) {
2004-
SDL_GL_LoadLibrary(NULL);
2005-
window->flags |= SDL_WINDOW_OPENGL;
2006-
}
2007-
}
2008-
20092002
if (window->x == SDL_WINDOWPOS_UNDEFINED) {
20102003
window->x = 0;
20112004
}

0 commit comments

Comments
 (0)