Merge branch 'blender-v3.4-release'
This commit is contained in:
commit
b8d1022dff
|
@ -5083,42 +5083,6 @@ static const struct wl_registry_listener registry_listener = {
|
|||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Listener (Display), #wl_display_listener
|
||||
* \{ */
|
||||
|
||||
static CLG_LogRef LOG_WL_DISPLAY = {"ghost.wl.handle.display"};
|
||||
#define LOG (&LOG_WL_DISPLAY)
|
||||
|
||||
static void display_handle_error(
|
||||
void *data, struct wl_display *wl_display, void *object_id, uint32_t code, const char *message)
|
||||
{
|
||||
GWL_Display *display = static_cast<GWL_Display *>(data);
|
||||
GHOST_ASSERT(display->wl_display == wl_display, "Invalid internal state");
|
||||
(void)display;
|
||||
|
||||
/* NOTE: code is #wl_display_error, there isn't a convenient way to convert to an ID. */
|
||||
CLOG_INFO(LOG, 2, "error (code=%u, object_id=%p, message=%s)", code, object_id, message);
|
||||
}
|
||||
|
||||
static void display_handle_delete_id(void *data, struct wl_display *wl_display, uint32_t id)
|
||||
{
|
||||
GWL_Display *display = static_cast<GWL_Display *>(data);
|
||||
GHOST_ASSERT(display->wl_display == wl_display, "Invalid internal state");
|
||||
(void)display;
|
||||
|
||||
CLOG_INFO(LOG, 2, "delete_id (id=%u)", id);
|
||||
}
|
||||
|
||||
static const struct wl_display_listener display_listener = {
|
||||
display_handle_error,
|
||||
display_handle_delete_id,
|
||||
};
|
||||
|
||||
#undef LOG
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name GHOST Implementation
|
||||
*
|
||||
|
@ -5141,8 +5105,6 @@ GHOST_SystemWayland::GHOST_SystemWayland(bool background)
|
|||
/* This may be removed later if decorations are required, needed as part of registration. */
|
||||
display_->xdg_decor = new GWL_XDG_Decor_System;
|
||||
|
||||
wl_display_add_listener(display_->wl_display, &display_listener, display_);
|
||||
|
||||
/* Register interfaces. */
|
||||
{
|
||||
display_->registry_skip_update_all = true;
|
||||
|
|
Loading…
Reference in New Issue