frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: check if creating xwl_output succeeded 

check return values of RR.*Create calls

v2. do not bail out if we don't have any output

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Marek Chalupa 2015-11-27 14:27:46 +01:00 committed by Adam Jackson
parent 646ebea456
commit 5b2ca34132
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/xwayland/xwayland-output.c
View File

@ -240,6 +240,11 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id)
xwl_output->output = wl_registry_bind(xwl_screen->registry, id, xwl_output->output = wl_registry_bind(xwl_screen->registry, id,
&wl_output_interface, 2); &wl_output_interface, 2);
if (!xwl_output->output) {
ErrorF("Failed binding wl_output\n");
goto err;
}
xwl_output->server_output_id = id; xwl_output->server_output_id = id;
wl_output_add_listener(xwl_output->output, &output_listener, xwl_output); wl_output_add_listener(xwl_output->output, &output_listener, xwl_output);
@ -247,13 +252,31 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id)
xwl_output->xwl_screen = xwl_screen; xwl_output->xwl_screen = xwl_screen;
xwl_output->randr_crtc = RRCrtcCreate(xwl_screen->screen, xwl_output); xwl_output->randr_crtc = RRCrtcCreate(xwl_screen->screen, xwl_output);
if (!xwl_output->randr_crtc) {
ErrorF("Failed creating RandR CRTC\n");
goto err;
}
xwl_output->randr_output = RROutputCreate(xwl_screen->screen, name, xwl_output->randr_output = RROutputCreate(xwl_screen->screen, name,
strlen(name), xwl_output); strlen(name), xwl_output);
if (!xwl_output->randr_output) {
ErrorF("Failed creating RandR Output\n");
goto err;
}
RRCrtcGammaSetSize(xwl_output->randr_crtc, 256); RRCrtcGammaSetSize(xwl_output->randr_crtc, 256);
RROutputSetCrtcs(xwl_output->randr_output, &xwl_output->randr_crtc, 1); RROutputSetCrtcs(xwl_output->randr_output, &xwl_output->randr_crtc, 1);
RROutputSetConnection(xwl_output->randr_output, RR_Connected); RROutputSetConnection(xwl_output->randr_output, RR_Connected);
return xwl_output; return xwl_output;
err:
if (xwl_output->randr_crtc)
RRCrtcDestroy(xwl_output->randr_crtc);
if (xwl_output->output)
wl_output_destroy(xwl_output->output);
free(xwl_output);
return NULL;
} }
void void

4
hw/xwayland/xwayland.c
View File

@ -421,8 +421,8 @@ registry_global(void *data, struct wl_registry *registry, uint32_t id,
wl_registry_bind(registry, id, &wl_shell_interface, 1); wl_registry_bind(registry, id, &wl_shell_interface, 1);
} }
else if (strcmp(interface, "wl_output") == 0 && version >= 2) { else if (strcmp(interface, "wl_output") == 0 && version >= 2) {
xwl_output_create(xwl_screen, id); if (xwl_output_create(xwl_screen, id))
xwl_screen->expecting_event++; xwl_screen->expecting_event++;
} }
#ifdef GLAMOR_HAS_GBM #ifdef GLAMOR_HAS_GBM
else if (xwl_screen->glamor && else if (xwl_screen->glamor &&