mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-26 06:59:52 -05: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

29
types/wlr_output.c
View file

@ -473,6 +473,25 @@ static void output_state_clear(struct wlr_output_state *state) {
state->committed = 0;
}
static void output_pending_resolution(struct wlr_output *output, int *width,
int *height) {
if (output->pending.committed & WLR_OUTPUT_STATE_MODE) {
switch (output->pending.mode_type) {
case WLR_OUTPUT_STATE_MODE_FIXED:
*width = output->pending.mode->width;
*height = output->pending.mode->height;
break;
case WLR_OUTPUT_STATE_MODE_CUSTOM:
*width = output->pending.custom_mode.width;
*height = output->pending.custom_mode.height;
break;
}
} else {
*width = output->width;
*height = output->height;
}
}
static bool output_basic_test(struct wlr_output *output) {
if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
if (output->frame_pending) {
@ -495,8 +514,14 @@ static bool output_basic_test(struct wlr_output *output) {
}
}
// TOOD: check width/height matches the output's, since scaling
// isn't supported
// If the size doesn't match, reject buffer (scaling is not
// supported)
int pending_width, pending_height;
output_pending_resolution(output, &pending_width, &pending_height);
if (output->pending.buffer->width != pending_width ||
output->pending.buffer->height != pending_height) {
return false;
}
}
}