Skip to content

Commit 0933cfd

Browse files
committed
Revert "Preserve behavior of libsdl-org/SDL@120b8d4"
The root issue necessitating this workaround was identified and fixed, and creating an EGL window when not needed can now cause protocol errors, as the EGL window object attaches a sync object to the surface, of which only one is allowed, so if some other part of the graphics stack then tries to attach another sync object, the program will be halted.
1 parent 8a72eae commit 0933cfd

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

src/sdl2_compat.c

-9
Original file line numberDiff line numberDiff line change
@@ -6944,7 +6944,6 @@ WindowPos2To3(int *x, int *y)
69446944
SDL_DECLSPEC SDL_Window * SDLCALL
69456945
SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
69466946
{
6947-
const char *driver;
69486947
SDL_Window *window = NULL;
69496948
const Uint32 is_popup = flags & (SDL_WINDOW_POPUP_MENU | SDL_WINDOW_TOOLTIP);
69506949

@@ -6959,14 +6958,6 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
69596958
flags |= SDL_WINDOW_UTILITY;
69606959
}
69616960

6962-
/* Preserve behavior in https://github.com/libsdl-org/SDL/commit/120b8d4189d0979e4838daeb25d5a69e6260f5e0 */
6963-
driver = SDL3_GetCurrentVideoDriver();
6964-
if (driver && SDL3_strcmp(driver, "wayland") == 0) {
6965-
if (!(flags & SDL_WINDOW_VULKAN)) {
6966-
flags |= SDL_WINDOW_OPENGL;
6967-
}
6968-
}
6969-
69706961
if (!is_popup) {
69716962
SDL_PropertiesID props = SDL3_CreateProperties();
69726963

0 commit comments

Comments
 (0)