mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend-x11: drop use_pixman from x11_backend

Browse Source 
Now that the renderer type is stored in struct weston_renderer,
use that instead of use_pixman to determine the renderer type.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2022-11-30 11:02:07 +01:00 committed by Daniel Stone
parent e752c8737f
commit 06eb28ba62
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,6 @@ struct x11_backend {
uint8_t xkb_event_base; uint8_t xkb_event_base;
int fullscreen; int fullscreen;
int no_input; int no_input;
int use_pixman;
int has_net_wm_state_fullscreen; int has_net_wm_state_fullscreen;
@ -858,7 +857,7 @@ x11_output_switch_mode(struct weston_output *base, struct weston_mode *mode)
weston_renderer_resize_output(&output->base, &fb_size, NULL); weston_renderer_resize_output(&output->base, &fb_size, NULL);
if (b->use_pixman) { if (base->compositor->renderer->type == WESTON_RENDERER_PIXMAN) {
x11_output_deinit_shm(b, output); x11_output_deinit_shm(b, output);
if (x11_output_init_shm(b, output, if (x11_output_init_shm(b, output,
fb_size.width, fb_size.height) < 0) { fb_size.width, fb_size.height) < 0) {
@ -888,7 +887,7 @@ x11_output_disable(struct weston_output *base)
wl_event_source_remove(output->finish_frame_timer); wl_event_source_remove(output->finish_frame_timer);
if (backend->use_pixman) { if (base->compositor->renderer->type == WESTON_RENDERER_PIXMAN) {
pixman_renderer_output_destroy(&output->base); pixman_renderer_output_destroy(&output->base);
x11_output_deinit_shm(backend, output); x11_output_deinit_shm(backend, output);
} else { } else {
@ -1022,7 +1021,7 @@ x11_output_enable(struct weston_output *base)
if (b->fullscreen) if (b->fullscreen)
x11_output_wait_for_map(b, output); x11_output_wait_for_map(b, output);
if (b->use_pixman) { if (base->compositor->renderer->type == WESTON_RENDERER_PIXMAN) {
const struct pixman_renderer_output_options options = { const struct pixman_renderer_output_options options = {
.use_shadow = true, .use_shadow = true,
.fb_size = { .fb_size = {
@ -1895,8 +1894,7 @@ x11_backend_create(struct weston_compositor *compositor,
config->fullscreen = 0; config->fullscreen = 0;
} }
b->use_pixman = config->use_pixman; if (config->use_pixman) {
if (b->use_pixman) {
if (pixman_renderer_init(compositor) < 0) { if (pixman_renderer_init(compositor) < 0) {
weston_log("Failed to initialize pixman renderer for X11 backend\n"); weston_log("Failed to initialize pixman renderer for X11 backend\n");
goto err_xdisplay; goto err_xdisplay;