Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

video: Only prefer Wayland if fifo-v1 and commit-timing-v1 are available #9383

Merged
merged 2 commits into from
Aug 3, 2024
Merged

video: Only prefer Wayland if fifo-v1 and commit-timing-v1 are available #9383

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98a8f8e
video: Only prefer Wayland if fifo-v1 and commit-timing-v1 are available
misyltoad Mar 27, 2024
a85abb0
video: Support multiple video driver entries having the same name string
Kontrabant Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/video/SDL_sysvideo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,8 @@ extern VideoBootStrap KMSDRM_bootstrap;
extern VideoBootStrap KMSDRM_LEGACY_bootstrap;
extern VideoBootStrap DUMMY_bootstrap;
extern VideoBootStrap DUMMY_evdev_bootstrap;
extern VideoBootStrap Wayland_bootstrap;
extern VideoBootStrap Wayland_preferred_bootstrap;
extern VideoBootStrap Wayland_fallback_bootstrap;
extern VideoBootStrap VIVANTE_bootstrap;
extern VideoBootStrap Emscripten_bootstrap;
extern VideoBootStrap OFFSCREEN_bootstrap;
Expand Down
5 changes: 4 additions & 1 deletion src/video/SDL_video.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,14 @@ static VideoBootStrap *bootstrap[] = {
&COCOA_bootstrap,
#endif
#ifdef SDL_VIDEO_DRIVER_WAYLAND
&Wayland_bootstrap,
&Wayland_preferred_bootstrap,
#endif
#ifdef SDL_VIDEO_DRIVER_X11
&X11_bootstrap,
#endif
#ifdef SDL_VIDEO_DRIVER_WAYLAND
&Wayland_fallback_bootstrap,
#endif
#ifdef SDL_VIDEO_DRIVER_VIVANTE
&VIVANTE_bootstrap,
#endif
Expand Down
82 changes: 79 additions & 3 deletions src/video/wayland/SDL_waylandvideo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
#include <libdecor.h>
#endif

#define WAYLANDVID_PREFERRED_DRIVER_NAME "wayland_preferred"
#define WAYLANDVID_DRIVER_NAME "wayland"

/* Clamp certain core protocol versions on older versions of libwayland. */
Expand Down Expand Up @@ -369,7 +370,54 @@ static void Wayland_DeleteDevice(SDL_VideoDevice *device)
SDL_WAYLAND_UnloadSymbols();
}

static SDL_VideoDevice *Wayland_CreateDevice(void)
typedef struct
{
SDL_bool has_fifo_v1;
SDL_bool has_commit_timing_v1;
} SDL_WaylandPreferredData;

static void wayland_preferred_check_handle_global(void *data, struct wl_registry *registry, uint32_t id,
const char *interface, uint32_t version)
{
SDL_WaylandPreferredData *d = data;

if (SDL_strcmp(interface, "wp_fifo_manager_v1") == 0) {
d->has_fifo_v1 = SDL_TRUE;
} else if (SDL_strcmp(interface, "wp_commit_timing_manager_v1") == 0) {
misyltoad marked this conversation as resolved.
Show resolved Hide resolved
d->has_commit_timing_v1 = SDL_TRUE;
}
}

static void wayland_preferred_check_remove_global(void *data, struct wl_registry *registry, uint32_t id)
{
/* No need to do anything here. */
}

static const struct wl_registry_listener preferred_registry_listener = {
wayland_preferred_check_handle_global,
wayland_preferred_check_remove_global
};

static SDL_bool Wayland_IsPreferred(struct wl_display *display)
{
struct wl_registry *registry = wl_display_get_registry(display);
SDL_WaylandPreferredData preferred_data = { 0 };

if (!registry) {
SDL_SetError("Failed to get the Wayland registry");
return SDL_FALSE;
}

wl_registry_add_listener(registry, &preferred_registry_listener, &preferred_data);

WAYLAND_wl_display_roundtrip(display);

wl_registry_destroy(registry);

return preferred_data.has_fifo_v1 && preferred_data.has_commit_timing_v1;
}

static SDL_VideoDevice *Wayland_CreateDevice(SDL_bool fallback)
{
SDL_VideoDevice *device;
SDL_VideoData *data;
Expand Down Expand Up @@ -398,6 +446,18 @@ static SDL_VideoDevice *Wayland_CreateDevice(void)
}
}

/*
* If we are checking for preferred Wayland, then let's query for
* fifo-v1 and commit-timing-v1's existance so we don't regress
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo

Suggested change
* fifo-v1 and commit-timing-v1's existance so we don't regress
* fifo-v1 and commit-timing-v1's existence so we don't regress

* GPU-bound performance and frame-pacing by default due to
* swapchain starvation.
*/
if (!fallback && !Wayland_IsPreferred(display)) {
WAYLAND_wl_display_disconnect(display);
SDL_WAYLAND_UnloadSymbols();
return NULL;
}

data = SDL_calloc(1, sizeof(*data));
if (!data) {
WAYLAND_wl_display_disconnect(display);
Expand Down Expand Up @@ -523,9 +583,25 @@ static SDL_VideoDevice *Wayland_CreateDevice(void)
return device;
}

VideoBootStrap Wayland_bootstrap = {
static SDL_VideoDevice *Wayland_Preferred_CreateDevice(void)
{
return Wayland_CreateDevice(SDL_FALSE);
}

static SDL_VideoDevice *Wayland_Fallback_CreateDevice(void)
{
return Wayland_CreateDevice(SDL_TRUE);
}

VideoBootStrap Wayland_preferred_bootstrap = {
WAYLANDVID_PREFERRED_DRIVER_NAME, "SDL Wayland video driver",
Wayland_Preferred_CreateDevice,
Wayland_ShowMessageBox
};

VideoBootStrap Wayland_fallback_bootstrap = {
WAYLANDVID_DRIVER_NAME, "SDL Wayland video driver",
Wayland_CreateDevice,
Wayland_Fallback_CreateDevice,
Wayland_ShowMessageBox
};

Expand Down