mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Wayland) Fix wayland vulkan not reacting to initial resize (#13640)

Browse Source 
(Wayland) Correct log stamps for GL or Vulkan

(Wayland) Fix style issues and sync formatting on identical code in GL and Vulkan
This commit is contained in:
Colin Kinloch 2022-02-22 07:58:46 +00:00 committed by GitHub
parent 023f427856
commit 6dec52fda7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 181 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
gfx/drivers_context/wayland_ctx.c
View File

@ -25,11 +25,6 @@
#include "../../config.h" #include "../../config.h"
#endif #endif
#ifdef HAVE_EGL
#include <wayland-egl.h>
#include "../common/egl_common.h"
#endif
#ifdef HAVE_LIBDECOR #ifdef HAVE_LIBDECOR
#include <libdecor.h> #include <libdecor.h>
#endif #endif
@ -49,6 +44,11 @@
/* Generated from xdg-decoration-unstable-v1.h */ /* Generated from xdg-decoration-unstable-v1.h */
#include "../common/wayland/xdg-decoration-unstable-v1.h" #include "../common/wayland/xdg-decoration-unstable-v1.h"
#ifdef HAVE_EGL
#include <wayland-egl.h>
#include "../common/egl_common.h"
#endif
static enum gfx_ctx_api wl_api = GFX_CTX_NONE; static enum gfx_ctx_api wl_api = GFX_CTX_NONE;
#ifndef EGL_OPENGL_ES3_BIT_KHR #ifndef EGL_OPENGL_ES3_BIT_KHR
@ -90,13 +90,11 @@ static void handle_toplevel_config_common(void *data,
break; break;
} }
} }
if ( width > 0 if ( width > 0
&& height > 0) && height > 0)
{ {
wl->prev_width = width; wl->width = width;
wl->prev_height = height; wl->height = height;
wl->width = width;
wl->height = height;
} }
#ifdef HAVE_EGL #ifdef HAVE_EGL
@ -205,18 +203,18 @@ static void gfx_ctx_wl_destroy_resources(gfx_ctx_wayland_data_t *wl)
} }
#ifdef HAVE_EGL #ifdef HAVE_EGL
wl->win = NULL; wl->win = NULL;
#endif #endif
wl->xdg_shell = NULL; wl->xdg_shell = NULL;
wl->compositor = NULL; wl->compositor = NULL;
wl->registry = NULL; wl->registry = NULL;
wl->input.dpy = NULL; wl->input.dpy = NULL;
wl->xdg_surface = NULL; wl->xdg_surface = NULL;
wl->surface = NULL; wl->surface = NULL;
wl->xdg_toplevel = NULL; wl->xdg_toplevel = NULL;
wl->width = 0; wl->width = 0;
wl->height = 0; wl->height = 0;
} }
@ -234,8 +232,8 @@ static void gfx_ctx_wl_check_window(void *data, bool *quit,
gfx_ctx_wl_get_video_size(data, &new_width, &new_height); gfx_ctx_wl_get_video_size(data, &new_width, &new_height);
if ( new_width != *width * wl->last_buffer_scale || if ( new_width != *width * wl->last_buffer_scale
new_height != *height * wl->last_buffer_scale) || new_height != *height * wl->last_buffer_scale)
{ {
*width = new_width; *width = new_width;
*height = new_height; *height = new_height;
@ -322,7 +320,7 @@ static void
handle_libdecor_error(struct libdecor *context, handle_libdecor_error(struct libdecor *context,
enum libdecor_error error, const char *message) enum libdecor_error error, const char *message)
{ {
RARCH_ERR("[Wayland]: libdecor Caught error (%d): %s\n", error, message); RARCH_ERR("[Wayland/GL]: libdecor Caught error (%d): %s\n", error, message);
} }
static struct libdecor_interface libdecor_interface = { static struct libdecor_interface libdecor_interface = {
@ -334,44 +332,43 @@ handle_libdecor_frame_configure(struct libdecor_frame *frame,
struct libdecor_configuration *configuration, void *data) struct libdecor_configuration *configuration, void *data)
{ {
int width, height; int width, height;
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
struct libdecor_state *state = NULL; struct libdecor_state *state = NULL;
static const enum static const enum
libdecor_window_state tiled_states = ( libdecor_window_state tiled_states = (
LIBDECOR_WINDOW_STATE_TILED_LEFT LIBDECOR_WINDOW_STATE_TILED_LEFT
| LIBDECOR_WINDOW_STATE_TILED_RIGHT | LIBDECOR_WINDOW_STATE_TILED_RIGHT
| LIBDECOR_WINDOW_STATE_TILED_TOP | LIBDECOR_WINDOW_STATE_TILED_TOP
| LIBDECOR_WINDOW_STATE_TILED_BOTTOM | LIBDECOR_WINDOW_STATE_TILED_BOTTOM
); );
enum libdecor_window_state window_state; enum libdecor_window_state window_state;
bool focused = false; bool focused = false;
bool tiled = false; bool tiled = false;
wl->fullscreen = false; wl->fullscreen = false;
wl->maximized = false; wl->maximized = false;
if (libdecor_configuration_get_window_state( if (libdecor_configuration_get_window_state(
configuration, &window_state)) configuration, &window_state))
{ {
wl->fullscreen = (window_state & LIBDECOR_WINDOW_STATE_FULLSCREEN) != 0; wl->fullscreen = (window_state & LIBDECOR_WINDOW_STATE_FULLSCREEN) != 0;
wl->maximized = (window_state & LIBDECOR_WINDOW_STATE_MAXIMIZED) != 0; wl->maximized = (window_state & LIBDECOR_WINDOW_STATE_MAXIMIZED) != 0;
focused = (window_state & LIBDECOR_WINDOW_STATE_ACTIVE) != 0; focused = (window_state & LIBDECOR_WINDOW_STATE_ACTIVE) != 0;
tiled = (window_state & tiled_states) != 0; tiled = (window_state & tiled_states) != 0;
} }
if (!libdecor_configuration_get_content_size(configuration, frame, if (!libdecor_configuration_get_content_size(configuration, frame,
&width, &height)) &width, &height))
{ {
width = wl->prev_width; width = wl->floating_width;
height = wl->prev_height; height = wl->floating_height;
} }
if (width > 0 && height > 0) if ( width > 0
&& height > 0)
{ {
wl->prev_width = width; wl->width = width;
wl->prev_height = height; wl->height = height;
wl->width = width;
wl->height = height;
} }
#ifdef HAVE_EGL #ifdef HAVE_EGL
@ -388,6 +385,11 @@ handle_libdecor_frame_configure(struct libdecor_frame *frame,
libdecor_frame_commit(frame, state, configuration); libdecor_frame_commit(frame, state, configuration);
libdecor_state_free(state); libdecor_state_free(state);
if (libdecor_frame_is_floating(frame)) {
wl->floating_width = width;
wl->floating_height = height;
}
wl->configured = false; wl->configured = false;
} }
@ -510,12 +512,12 @@ static void *gfx_ctx_wl_init(void *video_driver)
wl->input.dpy = wl_display_connect(NULL); wl->input.dpy = wl_display_connect(NULL);
wl->last_buffer_scale = 1; wl->last_buffer_scale = 1;
wl->buffer_scale = 1; wl->buffer_scale = 1;
wl->width = DEFAULT_WINDOWED_WIDTH; wl->floating_width = DEFAULT_WINDOWED_WIDTH;
wl->height = DEFAULT_WINDOWED_HEIGHT; wl->floating_height = DEFAULT_WINDOWED_HEIGHT;
if (!wl->input.dpy) if (!wl->input.dpy)
{ {
RARCH_ERR("[Wayland]: Failed to connect to Wayland server.\n"); RARCH_ERR("[Wayland/GL]: Failed to connect to Wayland server.\n");
goto error; goto error;
} }
@ -527,33 +529,33 @@ static void *gfx_ctx_wl_init(void *video_driver)
if (!wl->compositor) if (!wl->compositor)
{ {
RARCH_ERR("[Wayland]: Failed to create compositor.\n"); RARCH_ERR("[Wayland/GL]: Failed to create compositor.\n");
goto error; goto error;
} }
if (!wl->shm) if (!wl->shm)
{ {
RARCH_ERR("[Wayland]: Failed to create shm.\n"); RARCH_ERR("[Wayland/GL]: Failed to create shm.\n");
goto error; goto error;
} }
if (!wl->xdg_shell) if (!wl->xdg_shell)
{ {
RARCH_ERR("[Wayland]: Failed to create shell.\n"); RARCH_ERR("[Wayland/GL]: Failed to create shell.\n");
goto error; goto error;
} }
if (!wl->idle_inhibit_manager) if (!wl->idle_inhibit_manager)
{ {
RARCH_LOG("[Wayland]: Compositor doesn't support zwp_idle_inhibit_manager_v1 protocol\n"); RARCH_LOG("[Wayland/GL]: Compositor doesn't support zwp_idle_inhibit_manager_v1 protocol\n");
} }
if (!wl->deco_manager) if (!wl->deco_manager)
{ {
RARCH_LOG("[Wayland]: Compositor doesn't support zxdg_decoration_manager_v1 protocol\n"); RARCH_LOG("[Wayland/GL]: Compositor doesn't support zxdg_decoration_manager_v1 protocol\n");
} }
wl->surface = wl_compositor_create_surface(wl->compositor); wl->surface = wl_compositor_create_surface(wl->compositor);
wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale); wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale);
wl_surface_add_listener(wl->surface, &wl_surface_listener, wl); wl_surface_add_listener(wl->surface, &wl_surface_listener, wl);
@ -565,7 +567,7 @@ static void *gfx_ctx_wl_init(void *video_driver)
wl->libdecor_frame = libdecor_decorate(wl->libdecor_context, wl->surface, &libdecor_frame_interface, wl); wl->libdecor_frame = libdecor_decorate(wl->libdecor_context, wl->surface, &libdecor_frame_interface, wl);
if (!wl->libdecor_frame) if (!wl->libdecor_frame)
{ {
RARCH_ERR("[Wayland]: Failed to crate libdecor frame\n"); RARCH_ERR("[Wayland/GL]: Failed to crate libdecor frame\n");
goto error; goto error;
} }
@ -582,7 +584,7 @@ static void *gfx_ctx_wl_init(void *video_driver)
{ {
if (libdecor_dispatch(wl->libdecor_context, 0) < 0) if (libdecor_dispatch(wl->libdecor_context, 0) < 0)
{ {
RARCH_ERR("[Wayland]: libdecor failed to dispatch\n"); RARCH_ERR("[Wayland/GL]: libdecor failed to dispatch\n");
goto error; goto error;
} }
} }
@ -616,6 +618,8 @@ static void *gfx_ctx_wl_init(void *video_driver)
* which is usefull for HiDPI and auto selecting a display for fullscreen. */ * which is usefull for HiDPI and auto selecting a display for fullscreen. */
draw_splash_screen(wl); draw_splash_screen(wl);
wl_display_roundtrip(wl->input.dpy);
wl->input.fd = wl_display_get_fd(wl->input.dpy); wl->input.fd = wl_display_get_fd(wl->input.dpy);
#ifdef HAVE_EGL #ifdef HAVE_EGL
@ -640,7 +644,7 @@ static void *gfx_ctx_wl_init(void *video_driver)
wl->cursor.theme = wl_cursor_theme_load(NULL, 16, wl->shm); wl->cursor.theme = wl_cursor_theme_load(NULL, 16, wl->shm);
wl->cursor.default_cursor = wl_cursor_theme_get_cursor(wl->cursor.theme, "left_ptr"); wl->cursor.default_cursor = wl_cursor_theme_get_cursor(wl->cursor.theme, "left_ptr");
wl->num_active_touches = 0; wl->num_active_touches = 0;
for (i = 0;i < MAX_TOUCHES;i++) for (i = 0;i < MAX_TOUCHES;i++)
{ {
@ -692,8 +696,8 @@ static EGLint *egl_fill_attribs(gfx_ctx_wayland_data_t *wl, EGLint *attr)
*attr++ = wl->egl.major; *attr++ = wl->egl.major;
*attr++ = EGL_CONTEXT_MINOR_VERSION_KHR; *attr++ = EGL_CONTEXT_MINOR_VERSION_KHR;
*attr++ = wl->egl.minor; *attr++ = wl->egl.minor;
/* Technically, we don't have core/compat until 3.2. /* Technically, we don't have core/compat until 3.2
* Version 3.1 is either compat or not depending * Version 3.1 is either compat or not depending
* on GL_ARB_compatibility. */ * on GL_ARB_compatibility. */
if (version >= 3002) if (version >= 3002)
{ {
@ -715,7 +719,7 @@ static EGLint *egl_fill_attribs(gfx_ctx_wayland_data_t *wl, EGLint *attr)
case GFX_CTX_OPENGL_ES_API: case GFX_CTX_OPENGL_ES_API:
#ifdef HAVE_OPENGLES #ifdef HAVE_OPENGLES
*attr++ = EGL_CONTEXT_CLIENT_VERSION; *attr++ = EGL_CONTEXT_CLIENT_VERSION;
/* Same as EGL_CONTEXT_MAJOR_VERSION */ /* Same as EGL_CONTEXT_MAJOR_VERSION */
*attr++ = wl->egl.major ? (EGLint)wl->egl.major : 2; *attr++ = wl->egl.major ? (EGLint)wl->egl.major : 2;
#ifdef EGL_KHR_create_context #ifdef EGL_KHR_create_context
@ -768,23 +772,25 @@ static bool gfx_ctx_wl_set_video_mode(void *data,
EGLint *attr = egl_fill_attribs( EGLint *attr = egl_fill_attribs(
(gfx_ctx_wayland_data_t*)data, egl_attribs); (gfx_ctx_wayland_data_t*)data, egl_attribs);
#endif #endif
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned video_monitor_index = settings->uints.video_monitor_index; unsigned video_monitor_index = settings->uints.video_monitor_index;
wl->width = width ? width : DEFAULT_WINDOWED_WIDTH; wl->width = width ? width : DEFAULT_WINDOWED_WIDTH;
wl->height = height ? height : DEFAULT_WINDOWED_HEIGHT; wl->height = height ? height : DEFAULT_WINDOWED_HEIGHT;
wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale); wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale);
#ifdef HAVE_LIBDECOR #ifdef HAVE_LIBDECOR
struct libdecor_state *state = libdecor_state_new( width, height); struct libdecor_state *state = libdecor_state_new(width, height);
libdecor_frame_commit(wl->libdecor_frame, state, NULL); libdecor_frame_commit(wl->libdecor_frame, state, NULL);
libdecor_state_free(state); libdecor_state_free(state);
#endif #endif
#ifdef HAVE_EGL #ifdef HAVE_EGL
wl->win = wl_egl_window_create(wl->surface, wl->width * wl->buffer_scale, wl->height * wl->buffer_scale); wl->win = wl_egl_window_create(wl->surface,
wl->width * wl->buffer_scale,
wl->height * wl->buffer_scale);
#endif #endif
#ifdef HAVE_EGL #ifdef HAVE_EGL
@ -803,27 +809,27 @@ static bool gfx_ctx_wl_set_video_mode(void *data,
if (fullscreen) if (fullscreen)
{ {
struct wl_output *output = NULL; struct wl_output *output = NULL;
int output_i = 0; int output_i = 0;
output_info_t *oi, *tmp; output_info_t *oi, *tmp;
if (video_monitor_index <= 0 && wl->current_output != NULL) if (video_monitor_index <= 0 && wl->current_output != NULL)
{ {
oi = wl->current_output; oi = wl->current_output;
output = oi->output; output = oi->output;
RARCH_LOG("[Wayland/Vulkan]: Auto fullscreen on display \"%s\" \"%s\"\n", oi->make, oi->model); RARCH_LOG("[Wayland/GL]: Auto fullscreen on display \"%s\" \"%s\"\n", oi->make, oi->model);
} }
else wl_list_for_each_safe(oi, tmp, &wl->all_outputs, link) else wl_list_for_each_safe(oi, tmp, &wl->all_outputs, link)
{ {
if (++output_i == video_monitor_index) if (++output_i == video_monitor_index)
{ {
output = oi->output; output = oi->output;
RARCH_LOG("[Wayland/Vulkan]: Fullscreen on display %i \"%s\" \"%s\"\n", output_i, oi->make, oi->model); RARCH_LOG("[Wayland/GL]: Fullscreen on display %i \"%s\" \"%s\"\n", output_i, oi->make, oi->model);
break; break;
} }
} }
if (output == NULL) if (output == NULL)
RARCH_LOG("[Wayland/Vulkan] Failed to specify monitor for fullscreen, letting compositor decide\n"); RARCH_LOG("[Wayland/GL] Failed to specify monitor for fullscreen, letting compositor decide\n");
#ifdef HAVE_LIBDECOR #ifdef HAVE_LIBDECOR
libdecor_frame_set_fullscreen(wl->libdecor_frame, output); libdecor_frame_set_fullscreen(wl->libdecor_frame, output);
@ -891,13 +897,13 @@ static bool gfx_ctx_wl_suppress_screensaver(void *data, bool state)
if (state) if (state)
{ {
RARCH_LOG("[Wayland]: Enabling idle inhibitor\n"); RARCH_LOG("[Wayland/GL]: Enabling idle inhibitor\n");
struct zwp_idle_inhibit_manager_v1 *mgr = wl->idle_inhibit_manager; struct zwp_idle_inhibit_manager_v1 *mgr = wl->idle_inhibit_manager;
wl->idle_inhibitor = zwp_idle_inhibit_manager_v1_create_inhibitor(mgr, wl->surface); wl->idle_inhibitor = zwp_idle_inhibit_manager_v1_create_inhibitor(mgr, wl->surface);
} }
else else
{ {
RARCH_LOG("[Wayland]: Disabling the idle inhibitor\n"); RARCH_LOG("[Wayland/GL]: Disabling the idle inhibitor\n");
zwp_idle_inhibitor_v1_destroy(wl->idle_inhibitor); zwp_idle_inhibitor_v1_destroy(wl->idle_inhibitor);
wl->idle_inhibitor = NULL; wl->idle_inhibitor = NULL;
} }

186
gfx/drivers_context/wayland_vk_ctx.c
View File

@ -29,8 +29,6 @@
#include <libdecor.h> #include <libdecor.h>
#endif #endif
#include "../common/vulkan_common.h"
#include "../../frontend/frontend_driver.h" #include "../../frontend/frontend_driver.h"
#include "../../input/common/wayland_common.h" #include "../../input/common/wayland_common.h"
#include "../../input/input_driver.h" #include "../../input/input_driver.h"
@ -46,6 +44,8 @@
/* Generated from xdg-decoration-unstable-v1.h */ /* Generated from xdg-decoration-unstable-v1.h */
#include "../common/wayland/xdg-decoration-unstable-v1.h" #include "../common/wayland/xdg-decoration-unstable-v1.h"
#include "../common/vulkan_common.h"
#include <retro_timers.h> #include <retro_timers.h>
#ifndef EGL_PLATFORM_WAYLAND_KHR #ifndef EGL_PLATFORM_WAYLAND_KHR
@ -83,12 +83,11 @@ static void handle_toplevel_config_common(void *data,
break; break;
} }
} }
if (width > 0 && height > 0) if ( width > 0
&& height > 0)
{ {
wl->prev_width = width; wl->width = width;
wl->prev_height = height; wl->height = height;
wl->width = width;
wl->height = height;
} }
wl->configured = false; wl->configured = false;
@ -185,16 +184,16 @@ static void gfx_ctx_wl_destroy_resources(gfx_ctx_wayland_data_t *wl)
wl_display_disconnect(wl->input.dpy); wl_display_disconnect(wl->input.dpy);
} }
wl->xdg_shell = NULL; wl->xdg_shell = NULL;
wl->compositor = NULL; wl->compositor = NULL;
wl->registry = NULL; wl->registry = NULL;
wl->input.dpy = NULL; wl->input.dpy = NULL;
wl->xdg_surface = NULL; wl->xdg_surface = NULL;
wl->surface = NULL; wl->surface = NULL;
wl->xdg_toplevel = NULL; wl->xdg_toplevel = NULL;
wl->width = 0; wl->width = 0;
wl->height = 0; wl->height = 0;
} }
@ -216,7 +215,8 @@ static void gfx_ctx_wl_check_window(void *data, bool *quit,
* central place, so use that to trigger swapchain reinit. */ * central place, so use that to trigger swapchain reinit. */
*resize = wl->vk.need_new_swapchain; *resize = wl->vk.need_new_swapchain;
if (new_width != *width * wl->last_buffer_scale || new_height != *height * wl->last_buffer_scale) if ( new_width != *width * wl->last_buffer_scale
|| new_height != *height * wl->last_buffer_scale)
{ {
*width = new_width; *width = new_width;
*height = new_height; *height = new_height;
@ -247,6 +247,7 @@ static bool gfx_ctx_wl_set_resize(void *data, unsigned width, unsigned height)
wl->vk.need_new_swapchain = false; wl->vk.need_new_swapchain = false;
wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale); wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale);
return true; return true;
} }
@ -266,11 +267,8 @@ static void gfx_ctx_wl_update_title(void *data)
if (wl && title[0]) if (wl && title[0])
{ {
if (wl->deco) if (wl->deco)
{ zxdg_toplevel_decoration_v1_set_mode(wl->deco,
zxdg_toplevel_decoration_v1_set_mode(wl->deco, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
}
xdg_toplevel_set_title(wl->xdg_toplevel, title); xdg_toplevel_set_title(wl->xdg_toplevel, title);
} }
#endif #endif
@ -327,47 +325,55 @@ static void
handle_libdecor_frame_configure(struct libdecor_frame *frame, handle_libdecor_frame_configure(struct libdecor_frame *frame,
struct libdecor_configuration *configuration, void *data) struct libdecor_configuration *configuration, void *data)
{ {
struct libdecor_state *state;
int width, height; int width, height;
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
struct libdecor_state *state = NULL;
static const enum
libdecor_window_state tiled_states = (
LIBDECOR_WINDOW_STATE_TILED_LEFT
| LIBDECOR_WINDOW_STATE_TILED_RIGHT
| LIBDECOR_WINDOW_STATE_TILED_TOP
| LIBDECOR_WINDOW_STATE_TILED_BOTTOM
);
enum libdecor_window_state window_state; enum libdecor_window_state window_state;
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; bool focused = false;
bool focused = false; bool tiled = false;
bool tiled = false;
static const enum libdecor_window_state tiled_states = (
LIBDECOR_WINDOW_STATE_TILED_LEFT | LIBDECOR_WINDOW_STATE_TILED_RIGHT |
LIBDECOR_WINDOW_STATE_TILED_TOP | LIBDECOR_WINDOW_STATE_TILED_BOTTOM
);
wl->fullscreen = false; wl->fullscreen = false;
wl->maximized = false; wl->maximized = false;
if (libdecor_configuration_get_window_state(configuration, &window_state)) if (libdecor_configuration_get_window_state(
configuration, &window_state))
{ {
wl->fullscreen = (window_state & LIBDECOR_WINDOW_STATE_FULLSCREEN) != 0; wl->fullscreen = (window_state & LIBDECOR_WINDOW_STATE_FULLSCREEN) != 0;
wl->maximized = (window_state & LIBDECOR_WINDOW_STATE_MAXIMIZED) != 0; wl->maximized = (window_state & LIBDECOR_WINDOW_STATE_MAXIMIZED) != 0;
focused = (window_state & LIBDECOR_WINDOW_STATE_ACTIVE) != 0; focused = (window_state & LIBDECOR_WINDOW_STATE_ACTIVE) != 0;
tiled = (window_state & tiled_states) != 0; tiled = (window_state & tiled_states) != 0;
} }
if (!libdecor_configuration_get_content_size(configuration, frame, if (!libdecor_configuration_get_content_size(configuration, frame,
&width, &height)) &width, &height))
{ {
width = wl->prev_width; width = wl->floating_width;
height = wl->prev_height; height = wl->floating_height;
} }
if (width > 0 && height > 0) if ( width > 0
&& height > 0)
{ {
wl->prev_width = width; wl->width = width;
wl->prev_height = height; wl->height = height;
wl->width = width;
wl->height = height;
} }
state = libdecor_state_new(wl->width, wl->height); state = libdecor_state_new(wl->width, wl->height);
libdecor_frame_commit(frame, state, configuration); libdecor_frame_commit(frame, state, configuration);
libdecor_state_free(state); libdecor_state_free(state);
if (libdecor_frame_is_floating(frame)) {
wl->floating_width = width;
wl->floating_height = height;
}
wl->configured = false; wl->configured = false;
} }
@ -409,12 +415,12 @@ static void *gfx_ctx_wl_init(void *video_driver)
wl->input.dpy = wl_display_connect(NULL); wl->input.dpy = wl_display_connect(NULL);
wl->last_buffer_scale = 1; wl->last_buffer_scale = 1;
wl->buffer_scale = 1; wl->buffer_scale = 1;
wl->width = DEFAULT_WINDOWED_WIDTH; wl->floating_width = DEFAULT_WINDOWED_WIDTH;
wl->height = DEFAULT_WINDOWED_HEIGHT; wl->floating_height = DEFAULT_WINDOWED_HEIGHT;
if (!wl->input.dpy) if (!wl->input.dpy)
{ {
RARCH_ERR("[Wayland]: Failed to connect to Wayland server.\n"); RARCH_ERR("[Wayland/Vulkan]: Failed to connect to Wayland server.\n");
goto error; goto error;
} }
@ -426,33 +432,33 @@ static void *gfx_ctx_wl_init(void *video_driver)
if (!wl->compositor) if (!wl->compositor)
{ {
RARCH_ERR("[Wayland]: Failed to create compositor.\n"); RARCH_ERR("[Wayland/Vulkan]: Failed to create compositor.\n");
goto error; goto error;
} }
if (!wl->shm) if (!wl->shm)
{ {
RARCH_ERR("[Wayland]: Failed to create shm.\n"); RARCH_ERR("[Wayland/Vulkan]: Failed to create shm.\n");
goto error; goto error;
} }
if (!wl->xdg_shell) if (!wl->xdg_shell)
{ {
RARCH_ERR("[Wayland]: Failed to create shell.\n"); RARCH_ERR("[Wayland/Vulkan]: Failed to create shell.\n");
goto error; goto error;
} }
if (!wl->idle_inhibit_manager) if (!wl->idle_inhibit_manager)
{ {
RARCH_LOG("[Wayland]: Compositor doesn't support zwp_idle_inhibit_manager_v1 protocol\n"); RARCH_LOG("[Wayland/Vulkan]: Compositor doesn't support zwp_idle_inhibit_manager_v1 protocol\n");
} }
if (!wl->deco_manager) if (!wl->deco_manager)
{ {
RARCH_LOG("[Wayland]: Compositor doesn't support zxdg_decoration_manager_v1 protocol\n"); RARCH_LOG("[Wayland/Vulkan]: Compositor doesn't support zxdg_decoration_manager_v1 protocol\n");
} }
wl->surface = wl_compositor_create_surface(wl->compositor); wl->surface = wl_compositor_create_surface(wl->compositor);
wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale); wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale);
wl_surface_add_listener(wl->surface, &wl_surface_listener, wl); wl_surface_add_listener(wl->surface, &wl_surface_listener, wl);
@ -515,6 +521,8 @@ static void *gfx_ctx_wl_init(void *video_driver)
* which is usefull for HiDPI and auto selecting a display for fullscreen. */ * which is usefull for HiDPI and auto selecting a display for fullscreen. */
draw_splash_screen(wl); draw_splash_screen(wl);
wl_display_roundtrip(wl->input.dpy);
wl->input.fd = wl_display_get_fd(wl->input.dpy); wl->input.fd = wl_display_get_fd(wl->input.dpy);
if (!vulkan_context_init(&wl->vk, VULKAN_WSI_WAYLAND)) if (!vulkan_context_init(&wl->vk, VULKAN_WSI_WAYLAND))
@ -583,25 +591,32 @@ static bool gfx_ctx_wl_set_video_mode(void *data,
unsigned width, unsigned height, unsigned width, unsigned height,
bool fullscreen) bool fullscreen)
{ {
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned video_monitor_index = settings->uints.video_monitor_index; unsigned video_monitor_index = settings->uints.video_monitor_index;
wl->width = width ? width : DEFAULT_WINDOWED_WIDTH; wl->width = width ? width : DEFAULT_WINDOWED_WIDTH;
wl->height = height ? height : DEFAULT_WINDOWED_HEIGHT; wl->height = height ? height : DEFAULT_WINDOWED_HEIGHT;
wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale); wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale);
#ifdef HAVE_LIBDECOR #ifdef HAVE_LIBDECOR
struct libdecor_state *state = libdecor_state_new( width, height); struct libdecor_state *state = libdecor_state_new(width, height);
libdecor_frame_commit(wl->libdecor_frame, state, NULL); libdecor_frame_commit(wl->libdecor_frame, state, NULL);
libdecor_state_free(state); libdecor_state_free(state);
#endif #endif
if (!vulkan_surface_create(&wl->vk, VULKAN_WSI_WAYLAND,
wl->input.dpy, wl->surface,
wl->width * wl->buffer_scale,
wl->height * wl->buffer_scale,
wl->swap_interval))
goto error;
if (fullscreen) if (fullscreen)
{ {
struct wl_output *output = NULL; struct wl_output *output = NULL;
int output_i = 0; int output_i = 0;
output_info_t *oi, *tmp; output_info_t *oi, *tmp;
if (video_monitor_index <= 0 && wl->current_output != NULL) if (video_monitor_index <= 0 && wl->current_output != NULL)
@ -632,13 +647,6 @@ static bool gfx_ctx_wl_set_video_mode(void *data,
flush_wayland_fd(&wl->input); flush_wayland_fd(&wl->input);
wl_display_roundtrip(wl->input.dpy);
if (!vulkan_surface_create(&wl->vk, VULKAN_WSI_WAYLAND,
wl->input.dpy, wl->surface,
wl->width * wl->buffer_scale, wl->height * wl->buffer_scale, wl->swap_interval))
goto error;
if (fullscreen) if (fullscreen)
{ {
wl->cursor.visible = false; wl->cursor.visible = false;
@ -687,30 +695,32 @@ static bool gfx_ctx_wl_has_focus(void *data)
static bool gfx_ctx_wl_suppress_screensaver(void *data, bool state) static bool gfx_ctx_wl_suppress_screensaver(void *data, bool state)
{ {
(void)data; gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; if (!wl->idle_inhibit_manager)
return false;
if (state == (!!wl->idle_inhibitor))
return true;
if (!wl->idle_inhibit_manager) if (state)
return false; {
if (state == (!!wl->idle_inhibitor)) RARCH_LOG("[Wayland/Vulkan]: Enabling idle inhibitor\n");
return true; struct zwp_idle_inhibit_manager_v1 *mgr = wl->idle_inhibit_manager;
if (state) wl->idle_inhibitor = zwp_idle_inhibit_manager_v1_create_inhibitor(mgr, wl->surface);
{ }
RARCH_LOG("[Wayland]: Enabling idle inhibitor\n"); else
struct zwp_idle_inhibit_manager_v1 *mgr = wl->idle_inhibit_manager; {
wl->idle_inhibitor = zwp_idle_inhibit_manager_v1_create_inhibitor(mgr, wl->surface); RARCH_LOG("[Wayland/Vulkan]: Disabling the idle inhibitor\n");
} zwp_idle_inhibitor_v1_destroy(wl->idle_inhibitor);
else wl->idle_inhibitor = NULL;
{ }
RARCH_LOG("[Wayland]: Disabling the idle inhibitor\n"); return true;
zwp_idle_inhibitor_v1_destroy(wl->idle_inhibitor);
wl->idle_inhibitor = NULL;
}
return true;
} }
static enum gfx_ctx_api gfx_ctx_wl_get_api(void *data) { return GFX_CTX_VULKAN_API; } static enum gfx_ctx_api gfx_ctx_wl_get_api(void *data)
{
return GFX_CTX_VULKAN_API;
}
static bool gfx_ctx_wl_bind_api(void *video_driver, static bool gfx_ctx_wl_bind_api(void *video_driver,
enum gfx_ctx_api api, unsigned major, unsigned minor) enum gfx_ctx_api api, unsigned major, unsigned minor)

4
input/common/wayland_common.h
View File

@ -156,10 +156,10 @@ typedef struct gfx_ctx_wayland_data
int num_active_touches; int num_active_touches;
int swap_interval; int swap_interval;
touch_pos_t active_touch_positions[MAX_TOUCHES]; /* int32_t alignment */ touch_pos_t active_touch_positions[MAX_TOUCHES]; /* int32_t alignment */
unsigned prev_width;
unsigned prev_height;
unsigned width; unsigned width;
unsigned height; unsigned height;
unsigned floating_width;
unsigned floating_height;
unsigned last_buffer_scale; unsigned last_buffer_scale;
unsigned buffer_scale; unsigned buffer_scale;