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

wayland: Only require fifo-v1 for Wayland by default

Browse Source 
Some compositors may not implement commit-timing-v1 in addition to fifo-v1, at least not immediately, and Mesa doesn't require commit-timing for FIFO behavior. The fifo-v1 protocol alone is enough for the desired behavior.

Only check for fifo-v1 to enable Wayland by default.
This commit is contained in:
Frank Praznik
2024-12-11 23:37:58 -05:00
parent ac2edad809
commit 313d522f39
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/wayland/SDL_waylandvideo.c
View File

@@ -449,7 +449,6 @@ static void Wayland_DeleteDevice(SDL_VideoDevice *device)
typedef struct typedef struct
{ {
bool has_fifo_v1; bool has_fifo_v1;
bool has_commit_timing_v1;
} SDL_WaylandPreferredData; } SDL_WaylandPreferredData;
static void wayland_preferred_check_handle_global(void *data, struct wl_registry *registry, uint32_t id, static void wayland_preferred_check_handle_global(void *data, struct wl_registry *registry, uint32_t id,
@@ -459,8 +458,6 @@ static void wayland_preferred_check_handle_global(void *data, struct wl_registry
if (SDL_strcmp(interface, "wp_fifo_manager_v1") == 0) { if (SDL_strcmp(interface, "wp_fifo_manager_v1") == 0) {
d->has_fifo_v1 = true; d->has_fifo_v1 = true;
} else if (SDL_strcmp(interface, "wp_commit_timing_manager_v1") == 0) {
d->has_commit_timing_v1 = true;
} }
} }
@@ -490,7 +487,7 @@ static bool Wayland_IsPreferred(struct wl_display *display)
wl_registry_destroy(registry); wl_registry_destroy(registry);
return preferred_data.has_fifo_v1 && preferred_data.has_commit_timing_v1; return preferred_data.has_fifo_v1;
} }
static SDL_VideoDevice *Wayland_CreateDevice(bool require_preferred_protocols) static SDL_VideoDevice *Wayland_CreateDevice(bool require_preferred_protocols)
@@ -524,9 +521,8 @@ static SDL_VideoDevice *Wayland_CreateDevice(bool require_preferred_protocols)
/* /*
* If we are checking for preferred Wayland, then let's query for * If we are checking for preferred Wayland, then let's query for
* fifo-v1 and commit-timing-v1's existence, so we don't regress * fifo-v1's existence, so we don't regress GPU-bound performance
* GPU-bound performance and frame-pacing by default due to * and frame-pacing by default due to swapchain starvation.
* swapchain starvation.
*/ */
if (require_preferred_protocols && !Wayland_IsPreferred(display)) { if (require_preferred_protocols && !Wayland_IsPreferred(display)) {
WAYLAND_wl_display_disconnect(display); WAYLAND_wl_display_disconnect(display);