bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

GHOST/Wayland: bump wl_compositor_interface version from 3 to 6

Browse Source
This commit is contained in:
Campbell Barton 2024-04-14 17:55:14 +10:00
parent 6689053e43
commit dcec5ce635
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
intern/ghost/intern/GHOST_SystemWayland.cc
View File

@ -3615,9 +3615,27 @@ static void cursor_surface_handle_leave(void *data, wl_surface *wl_surface, wl_o
update_cursor_scale(seat->cursor, seat->system->wl_shm_get(), seat_state_pointer, wl_surface);
}
static void cursor_surface_handle_preferred_buffer_scale(void * /*data*/,
struct wl_surface * /*wl_surface*/,
int32_t factor)
{
/* Only available in interface version 6. */
CLOG_INFO(LOG, 2, "handle_preferred_buffer_scale (factor=%d)", factor);
}
static void cursor_surface_handle_preferred_buffer_transform(void * /*data*/,
struct wl_surface * /*wl_surface*/,
uint32_t transform)
{
/* Only available in interface version 6. */
CLOG_INFO(LOG, 2, "handle_preferred_buffer_transform (transform=%u)", transform);
}
static const wl_surface_listener cursor_surface_listener = {
/*enter*/ cursor_surface_handle_enter,
/*leave*/ cursor_surface_handle_leave,
/*preferred_buffer_scale*/ cursor_surface_handle_preferred_buffer_scale,
/*preferred_buffer_transform*/ cursor_surface_handle_preferred_buffer_transform,
};
#undef LOG
@ -6216,7 +6234,7 @@ static CLG_LogRef LOG_WL_REGISTRY = {"ghost.wl.handle.registry"};
static void gwl_registry_compositor_add(GWL_Display *display,
const GWL_RegisteryAdd_Params &params)
{
const uint version = GWL_IFACE_VERSION_CLAMP(params.version, 3u, 3u);
const uint version = GWL_IFACE_VERSION_CLAMP(params.version, 3u, 6u);
display->wl.compositor = static_cast<wl_compositor *>(
wl_registry_bind(display->wl.registry, params.name, &wl_compositor_interface, version));

18
intern/ghost/intern/GHOST_WindowWayland.cc
View File

@ -1564,9 +1564,27 @@ static void surface_handle_leave(void *data, wl_surface * /*wl_surface*/, wl_out
}
}
static void surface_handle_preferred_buffer_scale(void * /*data*/,
struct wl_surface * /*wl_surface*/,
int32_t factor)
{
/* Only available in interface version 6. */
CLOG_INFO(LOG, 2, "handle_preferred_buffer_scale (factor=%d)", factor);
}
static void surface_handle_preferred_buffer_transform(void * /*data*/,
struct wl_surface * /*wl_surface*/,
uint32_t transform)
{
/* Only available in interface version 6. */
CLOG_INFO(LOG, 2, "handle_preferred_buffer_transform (transform=%u)", transform);
}
static const wl_surface_listener wl_surface_listener = {
/*enter*/ surface_handle_enter,
/*leave*/ surface_handle_leave,
/*preferred_buffer_scale*/ surface_handle_preferred_buffer_scale,
/*preferred_buffer_transform*/ surface_handle_preferred_buffer_transform,
};
#undef LOG