mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backend-x11: use resize_output with pixman-renderer 

Now that resize_output() exists and is implemented for Pixman-renderer,
use it.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2022-07-22 15:09:29 +03:00 committed by Pekka Paalanen
parent e78e0cf53d
commit 84b5d0eb4b
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libweston/backend-x11/x11.c
View File

@ -824,6 +824,7 @@ x11_output_switch_mode(struct weston_output *base, struct weston_mode *mode)
{
struct x11_backend *b;
struct x11_output *output = to_x11_output(base);
struct weston_size fb_size;
static uint32_t values[2];
int ret;
@ -853,32 +854,17 @@ x11_output_switch_mode(struct weston_output *base, struct weston_mode *mode)
XCB_CONFIG_WINDOW_HEIGHT, values);
}
output->mode.width = mode->width;
output->mode.height = mode->height;
fb_size.width = output->mode.width = mode->width;
fb_size.height = output->mode.height = mode->height;
if (b->use_pixman) {
const struct pixman_renderer_output_options options = {
.use_shadow = true,
.fb_size = {
.width = output->base.current_mode->width,
.height = output->base.current_mode->height
},
};
pixman_renderer_output_destroy(&output->base);
weston_renderer_resize_output(&output->base, &fb_size, NULL);
x11_output_deinit_shm(b, output);
if (x11_output_init_shm(b, output,
output->base.current_mode->width,
output->base.current_mode->height) < 0) {
fb_size.width, fb_size.height) < 0) {
weston_log("Failed to initialize SHM for the X11 output\n");
return -1;
}
if (pixman_renderer_output_create(&output->base, &options) < 0) {
weston_log("Failed to create pixman renderer for output\n");
x11_output_deinit_shm(b, output);
return -1;
}
} else {
Window xid = (Window) output->window;
const struct gl_renderer_output_options options = {