mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Wayland) Fix resize check (#15065)

Browse Source 
* (Wayland) Fix resize check

Signed-off-by: Colin Kinloch <colin.kinloch@collabora.com>

* (Wayland/GL) Correct scaling on resize

Signed-off-by: Colin Kinloch <colin.kinloch@collabora.com>

* (Wayland) Fix fullscreen buffers being initially double scaled

Signed-off-by: Colin Kinloch <colin.kinloch@collabora.com>

---------

Signed-off-by: Colin Kinloch <colin.kinloch@collabora.com>
This commit is contained in:
Colin Kinloch 2023-03-08 19:08:31 +00:00 committed by GitHub
parent 51eafdd7fd
commit e31b7fe6c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 62 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
gfx/common/wayland_common.c
View File

@ -84,8 +84,10 @@ void xdg_toplevel_handle_configure_common(gfx_ctx_wayland_data_t *wl,
}
}
wl->width = width > 0 ? width : DEFAULT_WINDOWED_WIDTH;
wl->height = height > 0 ? height : DEFAULT_WINDOWED_HEIGHT;
wl->width = width > 0 ? width : DEFAULT_WINDOWED_WIDTH;
wl->height = height > 0 ? height : DEFAULT_WINDOWED_HEIGHT;
wl->buffer_width = wl->width * wl->buffer_scale;
wl->buffer_height = wl->height * wl->buffer_scale;
}
void xdg_toplevel_handle_close(void *data,
@ -100,7 +102,7 @@ void libdecor_frame_handle_configure_common(struct libdecor_frame *frame,
struct libdecor_configuration *configuration,
gfx_ctx_wayland_data_t *wl)
{
int width, height;
int width = 0, height = 0;
struct libdecor_state *state = NULL;
enum libdecor_window_state window_state;
#if 0
@ -139,8 +141,10 @@ void libdecor_frame_handle_configure_common(struct libdecor_frame *frame,
if ( width > 0
&& height > 0)
{
wl->width = width;
wl->height = height;
wl->width = width;
wl->height = height;
wl->buffer_width = width * wl->buffer_scale;
wl->buffer_height = height * wl->buffer_scale;
}
state = wl->libdecor_state_new(wl->width, wl->height);
@ -188,8 +192,8 @@ void gfx_ctx_wl_get_video_size_common(gfx_ctx_wayland_data_t *wl,
}
else
{
*width = wl->width * wl->buffer_scale;
*height = wl->height * wl->buffer_scale;
*width = wl->buffer_width;
*height = wl->buffer_height;
}
}
@ -243,16 +247,18 @@ void gfx_ctx_wl_destroy_resources_common(gfx_ctx_wayland_data_t *wl)
wl_display_disconnect(wl->input.dpy);
}
wl->xdg_shell = NULL;
wl->compositor = NULL;
wl->registry = NULL;
wl->input.dpy = NULL;
wl->xdg_surface = NULL;
wl->surface = NULL;
wl->xdg_toplevel = NULL;
wl->xdg_shell = NULL;
wl->compositor = NULL;
wl->registry = NULL;
wl->input.dpy = NULL;
wl->xdg_surface = NULL;
wl->surface = NULL;
wl->xdg_toplevel = NULL;
wl->width = 0;
wl->height = 0;
wl->width = 0;
wl->height = 0;
wl->buffer_width = 0;
wl->buffer_height = 0;
}
void gfx_ctx_wl_update_title_common(gfx_ctx_wayland_data_t *wl)
@ -436,23 +442,23 @@ static void shm_buffer_paint_checkerboard(
static bool wl_draw_splash_screen(gfx_ctx_wayland_data_t *wl)
{
shm_buffer_t *buffer = create_shm_buffer(wl,
wl->width * wl->buffer_scale,
wl->height * wl->buffer_scale,
wl->buffer_width,
wl->buffer_height,
WL_SHM_FORMAT_XRGB8888);
if (!buffer)
return false;
shm_buffer_paint_checkerboard(buffer, wl->width,
wl->height, wl->buffer_scale,
shm_buffer_paint_checkerboard(buffer, wl->buffer_width,
wl->buffer_height, 1,
16, 0xffbcbcbc, 0xff8e8e8e);
wl_surface_attach(wl->surface, buffer->wl_buffer, 0, 0);
wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale);
if (wl_surface_get_version(wl->surface) >= WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION)
wl_surface_damage_buffer(wl->surface, 0, 0,
wl->width * wl->buffer_scale,
wl->height * wl->buffer_scale);
wl->buffer_width,
wl->buffer_height);
wl_surface_commit(wl->surface);
return true;
}
@ -626,13 +632,21 @@ error:
}
bool gfx_ctx_wl_set_video_mode_common_size(gfx_ctx_wayland_data_t *wl,
unsigned width, unsigned height)
unsigned width, unsigned height, bool fullscreen)
{
settings_t *settings = config_get_ptr();
unsigned video_monitor_index = settings->uints.video_monitor_index;
wl->width = width ? width : DEFAULT_WINDOWED_WIDTH;
wl->height = height ? height : DEFAULT_WINDOWED_HEIGHT;
wl->width = width ? width : DEFAULT_WINDOWED_WIDTH;
wl->height = height ? height : DEFAULT_WINDOWED_HEIGHT;
wl->buffer_width = wl->width;
wl->buffer_height = wl->height;
if (!fullscreen)
{
wl->buffer_width *= wl->buffer_scale;
wl->buffer_height *= wl->buffer_scale;
}
wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale);
@ -751,13 +765,10 @@ void gfx_ctx_wl_check_window_common(gfx_ctx_wayland_data_t *wl,
flush_wayland_fd(&wl->input);
new_width = *width * wl->last_buffer_scale;
new_height = *height * wl->last_buffer_scale;
get_video_size(wl, &new_width, &new_height);
if ( new_width != *width * wl->last_buffer_scale
|| new_height != *height * wl->last_buffer_scale)
if ( new_width != *width
|| new_height != *height)
{
*width = new_width;
*height = new_height;

2
gfx/common/wayland_common.h
View File

@ -66,7 +66,7 @@ bool gfx_ctx_wl_init_common(
gfx_ctx_wayland_data_t **wl);
bool gfx_ctx_wl_set_video_mode_common_size(gfx_ctx_wayland_data_t *wl,
unsigned width, unsigned height);
unsigned width, unsigned height, bool fullscreen);
bool gfx_ctx_wl_set_video_mode_common_fullscreen(gfx_ctx_wayland_data_t *wl,
bool fullscreen);

24
gfx/drivers_context/wayland_ctx.c
View File

@ -65,11 +65,14 @@ static void xdg_toplevel_handle_configure(void *data,
xdg_toplevel_handle_configure_common(wl, toplevel, width, height, states);
#ifdef HAVE_EGL
if (wl->win)
wl_egl_window_resize(wl->win, wl->width, wl->height, 0, 0);
wl_egl_window_resize(wl->win,
wl->buffer_width,
wl->buffer_height,
0, 0);
else
wl->win = wl_egl_window_create(wl->surface,
wl->width * wl->buffer_scale,
wl->height * wl->buffer_scale);
wl->buffer_width,
wl->buffer_height);
#endif
wl->configured = false;
@ -144,12 +147,15 @@ libdecor_frame_handle_configure(struct libdecor_frame *frame,
#ifdef HAVE_EGL
if (wl->win)
wl_egl_window_resize(wl->win, wl->width, wl->height, 0, 0);
wl_egl_window_resize(wl->win,
wl->buffer_width,
wl->buffer_height,
0, 0);
else
wl->win = wl_egl_window_create(
wl->surface,
wl->width * wl->buffer_scale,
wl->height * wl->buffer_scale);
wl->buffer_width,
wl->buffer_height);
#endif
wl->configured = false;
@ -387,7 +393,7 @@ static bool gfx_ctx_wl_set_video_mode(void *data,
{
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
if (!gfx_ctx_wl_set_video_mode_common_size(wl, width, height))
if (!gfx_ctx_wl_set_video_mode_common_size(wl, width, height, fullscreen))
goto error;
#ifdef HAVE_EGL
@ -396,8 +402,8 @@ static bool gfx_ctx_wl_set_video_mode(void *data,
(gfx_ctx_wayland_data_t*)data, egl_attribs);
wl->win = wl_egl_window_create(wl->surface,
wl->width * wl->buffer_scale,
wl->height * wl->buffer_scale);
wl->buffer_width,
wl->buffer_height);
if (!egl_create_context(&wl->egl, (attr != egl_attribs)
? egl_attribs : NULL))

6
gfx/drivers_context/wayland_vk_ctx.c
View File

@ -199,13 +199,13 @@ static bool gfx_ctx_wl_set_video_mode(void *data,
{
gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
if (!gfx_ctx_wl_set_video_mode_common_size(wl, width, height))
if (!gfx_ctx_wl_set_video_mode_common_size(wl, width, height, fullscreen))
goto error;
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->buffer_width,
wl->buffer_height,
wl->swap_interval))
goto error;

2
input/common/wayland_common.h
View File

@ -178,6 +178,8 @@ typedef struct gfx_ctx_wayland_data
touch_pos_t active_touch_positions[MAX_TOUCHES]; /* int32_t alignment */
unsigned width;
unsigned height;
unsigned buffer_width;
unsigned buffer_height;
unsigned floating_width;
unsigned floating_height;
unsigned last_buffer_scale;