mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: check for buffer size compatibility in common code

Browse source 
Instead of checking for buffer size compatibility in each backend,
centralize the check in wlr_output itself.
This commit is contained in:
Simon Ser 2020-04-10 14:54:33 +02:00 • committed by Drew DeVault
parent 5f092c55d1
commit 50ade3671f
3 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
backend/wayland/output.c
View file

@ -128,17 +128,12 @@ static const struct wl_buffer_listener buffer_listener = {
};
static bool test_buffer(struct wlr_wl_backend *wl,
struct wlr_buffer *wlr_buffer,
int required_width, int required_height) {
struct wlr_buffer *wlr_buffer) {
struct wlr_dmabuf_attributes attribs;
if (!wlr_buffer_get_dmabuf(wlr_buffer, &attribs)) {
return false;
}
if (attribs.width != required_width || attribs.height != required_height) {
return false;
}
if (!wlr_drm_format_set_has(&wl->linux_dmabuf_v1_formats,
attribs.format, attribs.modifier)) {
return false;
@ -148,9 +143,8 @@ static bool test_buffer(struct wlr_wl_backend *wl,
}
static struct wlr_wl_buffer *create_wl_buffer(struct wlr_wl_backend *wl,
struct wlr_buffer *wlr_buffer,
int required_width, int required_height) {
if (!test_buffer(wl, wlr_buffer, required_width, required_height)) {
struct wlr_buffer *wlr_buffer) {
if (!test_buffer(wl, wlr_buffer)) {
return NULL;
}
@ -253,8 +247,8 @@ static bool output_commit(struct wlr_output *wlr_output) {
}
break;
case WLR_OUTPUT_STATE_BUFFER_SCANOUT:;
struct wlr_wl_buffer *buffer = create_wl_buffer(output->backend,
wlr_output->pending.buffer, wlr_output->width, wlr_output->height);
struct wlr_wl_buffer *buffer =
create_wl_buffer(output->backend, wlr_output->pending.buffer);
if (buffer == NULL) {
return false;
}