itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "output: atomic mode"

Browse Source 
This reverts commit ee5f98ad49.

This intoduced problems where outputs could not be turned off because
they had flips pending.
master
Rouven Czerwinski 5 years ago committed by Drew DeVault
parent 4d36cc86eb
commit 01f903874b
10 changed files with 112 additions and 289 deletions
Show Stats Download Patch File Download Diff File

38
backend/drm/drm.c
Unescape View File

@ -328,9 +328,12 @@ static bool drm_connector_attach_render(struct wlr_output *output,
return make_drm_surface_current(&conn->crtc->primary->surf, buffer_age); return make_drm_surface_current(&conn->crtc->primary->surf, buffer_age);
} }
static bool drm_connector_commit_buffer(struct wlr_output *output) { static bool drm_connector_commit(struct wlr_output *output) {
struct wlr_drm_connector *conn = get_drm_connector_from_output(output); struct wlr_drm_connector *conn = get_drm_connector_from_output(output);
struct wlr_drm_backend *drm = get_drm_backend_from_backend(output->backend); struct wlr_drm_backend *drm = get_drm_backend_from_backend(output->backend);
if (!drm->session->active) {
return false;
}
struct wlr_drm_crtc *crtc = conn->crtc; struct wlr_drm_crtc *crtc = conn->crtc;
if (!crtc) { if (!crtc) {
@ -401,37 +404,6 @@ static bool drm_connector_commit_buffer(struct wlr_output *output) {
return true; return true;
} }
static bool drm_connector_commit(struct wlr_output *output) {
struct wlr_drm_backend *drm = get_drm_backend_from_backend(output->backend);
if (!drm->session->active) {
return false;
}
if (output->pending.committed & WLR_OUTPUT_STATE_ENABLED) {
if (!enable_drm_connector(output, output->pending.enabled)) {
return false;
}
}
if (output->pending.committed & WLR_OUTPUT_STATE_MODE) {
if (output->pending.mode_type != WLR_OUTPUT_STATE_MODE_FIXED) {
return false;
}
if (!drm_connector_set_mode(output, output->pending.mode)) {
return false;
}
}
if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
if (!drm_connector_commit_buffer(output)) {
return false;
}
}
return true;
}
static void fill_empty_gamma_table(size_t size, static void fill_empty_gamma_table(size_t size,
uint16_t *r, uint16_t *g, uint16_t *b) { uint16_t *r, uint16_t *g, uint16_t *b) {
for (uint32_t i = 0; i < size; ++i) { for (uint32_t i = 0; i < size; ++i) {
@ -950,6 +922,8 @@ static void drm_connector_destroy(struct wlr_output *output) {
} }
static const struct wlr_output_impl output_impl = { static const struct wlr_output_impl output_impl = {
.enable = enable_drm_connector,
.set_mode = drm_connector_set_mode,
.set_cursor = drm_connector_set_cursor, .set_cursor = drm_connector_set_cursor,
.move_cursor = drm_connector_move_cursor, .move_cursor = drm_connector_move_cursor,
.destroy = drm_connector_destroy, .destroy = drm_connector_destroy,

23
backend/headless/output.c
Unescape View File

@ -58,26 +58,8 @@ static bool output_attach_render(struct wlr_output *wlr_output,
} }
static bool output_commit(struct wlr_output *wlr_output) { static bool output_commit(struct wlr_output *wlr_output) {
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_ENABLED) { // Nothing needs to be done for pbuffers
wlr_log(WLR_DEBUG, "Cannot disable a headless output"); wlr_output_send_present(wlr_output, NULL);
return false;
}
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_MODE) {
assert(wlr_output->pending.mode_type == WLR_OUTPUT_STATE_MODE_CUSTOM);
if (!output_set_custom_mode(wlr_output,
wlr_output->pending.custom_mode.width,
wlr_output->pending.custom_mode.height,
wlr_output->pending.custom_mode.refresh)) {
return false;
}
}
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
// Nothing needs to be done for pbuffers
wlr_output_send_present(wlr_output, NULL);
}
return true; return true;
} }
@ -94,6 +76,7 @@ static void output_destroy(struct wlr_output *wlr_output) {
} }
static const struct wlr_output_impl output_impl = { static const struct wlr_output_impl output_impl = {
.set_custom_mode = output_set_custom_mode,
.destroy = output_destroy, .destroy = output_destroy,
.attach_render = output_attach_render, .attach_render = output_attach_render,
.commit = output_commit, .commit = output_commit,

26
backend/noop/output.c
Unescape View File

@ -12,30 +12,19 @@ static struct wlr_noop_output *noop_output_from_output(
return (struct wlr_noop_output *)wlr_output; return (struct wlr_noop_output *)wlr_output;
} }
static bool output_set_custom_mode(struct wlr_output *wlr_output,
int32_t width, int32_t height, int32_t refresh) {
wlr_output_update_custom_mode(wlr_output, width, height, refresh);
return true;
}
static bool output_attach_render(struct wlr_output *wlr_output, static bool output_attach_render(struct wlr_output *wlr_output,
int *buffer_age) { int *buffer_age) {
return false; return false;
} }
static bool output_commit(struct wlr_output *wlr_output) { static bool output_commit(struct wlr_output *wlr_output) {
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_ENABLED) { return false;
wlr_log(WLR_DEBUG, "Cannot disable a noop output");
return false;
}
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_MODE) {
assert(wlr_output->pending.mode_type == WLR_OUTPUT_STATE_MODE_CUSTOM);
wlr_output_update_custom_mode(wlr_output,
wlr_output->pending.custom_mode.width,
wlr_output->pending.custom_mode.height,
wlr_output->pending.custom_mode.refresh);
}
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
return false;
}
return true;
} }
static void output_destroy(struct wlr_output *wlr_output) { static void output_destroy(struct wlr_output *wlr_output) {
@ -48,6 +37,7 @@ static void output_destroy(struct wlr_output *wlr_output) {
} }
static const struct wlr_output_impl output_impl = { static const struct wlr_output_impl output_impl = {
.set_custom_mode = output_set_custom_mode,
.destroy = output_destroy, .destroy = output_destroy,
.attach_render = output_attach_render, .attach_render = output_attach_render,
.commit = output_commit, .commit = output_commit,

34
backend/rdp/output.c
Unescape View File

@ -166,9 +166,9 @@ static bool nsc_swap_buffers(
return true; return true;
} }
static bool output_commit_buffer(struct wlr_rdp_output *output) { static bool output_commit(struct wlr_output *wlr_output) {
struct wlr_output *wlr_output = &output->wlr_output; struct wlr_rdp_output *output =
rdp_output_from_output(wlr_output);
bool ret = false; bool ret = false;
pixman_region32_t output_region; pixman_region32_t output_region;
@ -220,33 +220,6 @@ out:
return ret; return ret;
} }
static bool output_commit(struct wlr_output *wlr_output) {
struct wlr_rdp_output *output = rdp_output_from_output(wlr_output);
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_ENABLED) {
wlr_log(WLR_DEBUG, "Cannot disable an RDP output");
return false;
}
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_MODE) {
assert(wlr_output->pending.mode_type == WLR_OUTPUT_STATE_MODE_CUSTOM);
if (!output_set_custom_mode(wlr_output,
wlr_output->pending.custom_mode.width,
wlr_output->pending.custom_mode.height,
wlr_output->pending.custom_mode.refresh)) {
return false;
}
}
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
if (!output_commit_buffer(output)) {
return false;
}
}
return true;
}
static void output_destroy(struct wlr_output *wlr_output) { static void output_destroy(struct wlr_output *wlr_output) {
struct wlr_rdp_output *output = struct wlr_rdp_output *output =
rdp_output_from_output(wlr_output); rdp_output_from_output(wlr_output);
@ -261,6 +234,7 @@ static void output_destroy(struct wlr_output *wlr_output) {
} }
static const struct wlr_output_impl output_impl = { static const struct wlr_output_impl output_impl = {
.set_custom_mode = output_set_custom_mode,
.destroy = output_destroy, .destroy = output_destroy,
.attach_render = output_attach_render, .attach_render = output_attach_render,
.commit = output_commit, .commit = output_commit,

45
backend/wayland/output.c
Unescape View File

@ -63,44 +63,26 @@ static bool output_commit(struct wlr_output *wlr_output) {
struct wlr_wl_output *output = struct wlr_wl_output *output =
get_wl_output_from_output(wlr_output); get_wl_output_from_output(wlr_output);
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_ENABLED) { if (output->frame_callback != NULL) {
wlr_log(WLR_DEBUG, "Cannot disable a Wayland output"); wlr_log(WLR_ERROR, "Skipping buffer swap");
return false; return false;
} }
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_MODE) { output->frame_callback = wl_surface_frame(output->surface);
assert(wlr_output->pending.mode_type == WLR_OUTPUT_STATE_MODE_CUSTOM); wl_callback_add_listener(output->frame_callback, &frame_listener, output);
if (!output_set_custom_mode(wlr_output,
wlr_output->pending.custom_mode.width,
wlr_output->pending.custom_mode.height,
wlr_output->pending.custom_mode.refresh)) {
return false;
}
}
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
if (output->frame_callback != NULL) {
wlr_log(WLR_ERROR, "Skipping buffer swap");
return false;
}
output->frame_callback = wl_surface_frame(output->surface);
wl_callback_add_listener(output->frame_callback, &frame_listener, output);
pixman_region32_t *damage = NULL;
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_DAMAGE) {
damage = &wlr_output->pending.damage;
}
if (!wlr_egl_swap_buffers(&output->backend->egl, pixman_region32_t *damage = NULL;
output->egl_surface, damage)) { if (wlr_output->pending.committed & WLR_OUTPUT_STATE_DAMAGE) {
return false; damage = &wlr_output->pending.damage;
} }
// TODO: if available, use the presentation-time protocol if (!wlr_egl_swap_buffers(&output->backend->egl,
wlr_output_send_present(wlr_output, NULL); output->egl_surface, damage)) {
return false;
} }
// TODO: if available, use the presentation-time protocol
wlr_output_send_present(wlr_output, NULL);
return true; return true;
} }
@ -237,6 +219,7 @@ static bool output_schedule_frame(struct wlr_output *wlr_output) {
} }
static const struct wlr_output_impl output_impl = { static const struct wlr_output_impl output_impl = {
.set_custom_mode = output_set_custom_mode,
.destroy = output_destroy, .destroy = output_destroy,
.attach_render = output_attach_render, .attach_render = output_attach_render,
.commit = output_commit, .commit = output_commit,

31
backend/x11/output.c
Unescape View File

@ -103,38 +103,21 @@ static bool output_commit(struct wlr_output *wlr_output) {
struct wlr_x11_output *output = get_x11_output_from_output(wlr_output); struct wlr_x11_output *output = get_x11_output_from_output(wlr_output);
struct wlr_x11_backend *x11 = output->x11; struct wlr_x11_backend *x11 = output->x11;
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_ENABLED) { pixman_region32_t *damage = NULL;
wlr_log(WLR_DEBUG, "Cannot disable an X11 output"); if (wlr_output->pending.committed & WLR_OUTPUT_STATE_DAMAGE) {
return false; damage = &wlr_output->pending.damage;
} }
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_MODE) { if (!wlr_egl_swap_buffers(&x11->egl, output->surf, damage)) {
assert(wlr_output->pending.mode_type == WLR_OUTPUT_STATE_MODE_CUSTOM); return false;
if (!output_set_custom_mode(wlr_output,
wlr_output->pending.custom_mode.width,
wlr_output->pending.custom_mode.height,
wlr_output->pending.custom_mode.refresh)) {
return false;
}
}
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
pixman_region32_t *damage = NULL;
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_DAMAGE) {
damage = &wlr_output->pending.damage;
}
if (!wlr_egl_swap_buffers(&x11->egl, output->surf, damage)) {
return false;
}
wlr_output_send_present(wlr_output, NULL);
} }
wlr_output_send_present(wlr_output, NULL);
return true; return true;
} }
static const struct wlr_output_impl output_impl = { static const struct wlr_output_impl output_impl = {
.set_custom_mode = output_set_custom_mode,
.destroy = output_destroy, .destroy = output_destroy,
.attach_render = output_attach_render, .attach_render = output_attach_render,
.commit = output_commit, .commit = output_commit,

4
include/wlr/interfaces/wlr_output.h
Unescape View File

@ -15,6 +15,10 @@
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
struct wlr_output_impl { struct wlr_output_impl {
bool (*enable)(struct wlr_output *output, bool enable);
bool (*set_mode)(struct wlr_output *output, struct wlr_output_mode *mode);
bool (*set_custom_mode)(struct wlr_output *output, int32_t width,
int32_t height, int32_t refresh);
bool (*set_cursor)(struct wlr_output *output, struct wlr_texture *texture, bool (*set_cursor)(struct wlr_output *output, struct wlr_texture *texture,
int32_t scale, enum wl_output_transform transform, int32_t scale, enum wl_output_transform transform,
int32_t hotspot_x, int32_t hotspot_y, bool update_texture); int32_t hotspot_x, int32_t hotspot_y, bool update_texture);

48
include/wlr/types/wlr_output.h
Unescape View File

@ -49,10 +49,6 @@ struct wlr_output_cursor {
enum wlr_output_state_field { enum wlr_output_state_field {
WLR_OUTPUT_STATE_BUFFER = 1 << 0, WLR_OUTPUT_STATE_BUFFER = 1 << 0,
WLR_OUTPUT_STATE_DAMAGE = 1 << 1, WLR_OUTPUT_STATE_DAMAGE = 1 << 1,
WLR_OUTPUT_STATE_MODE = 1 << 2,
WLR_OUTPUT_STATE_ENABLED = 1 << 3,
WLR_OUTPUT_STATE_SCALE = 1 << 4,
WLR_OUTPUT_STATE_TRANSFORM = 1 << 5,
}; };
enum wlr_output_state_buffer_type { enum wlr_output_state_buffer_type {
@ -60,32 +56,16 @@ enum wlr_output_state_buffer_type {
WLR_OUTPUT_STATE_BUFFER_SCANOUT, WLR_OUTPUT_STATE_BUFFER_SCANOUT,
}; };
enum wlr_output_state_mode_type {
WLR_OUTPUT_STATE_MODE_FIXED,
WLR_OUTPUT_STATE_MODE_CUSTOM,
};
/** /**
* Holds the double-buffered output state. * Holds the double-buffered output state.
*/ */
struct wlr_output_state { struct wlr_output_state {
uint32_t committed; // enum wlr_output_state_field uint32_t committed; // enum wlr_output_state_field
pixman_region32_t damage; // output-buffer-local coordinates pixman_region32_t damage; // output-buffer-local coordinates
bool enabled;
float scale;
enum wl_output_transform transform;
// only valid if WLR_OUTPUT_STATE_BUFFER // only valid if WLR_OUTPUT_STATE_BUFFER
enum wlr_output_state_buffer_type buffer_type; enum wlr_output_state_buffer_type buffer_type;
struct wlr_buffer *buffer; // if WLR_OUTPUT_STATE_BUFFER_SCANOUT struct wlr_buffer *buffer; // if WLR_OUTPUT_STATE_BUFFER_SCANOUT
// only valid if WLR_OUTPUT_STATE_MODE
enum wlr_output_state_mode_type mode_type;
struct wlr_output_mode *mode;
struct {
int32_t width, height;
int32_t refresh; // mHz, may be zero
} custom_mode;
}; };
struct wlr_output_impl; struct wlr_output_impl;
@ -203,11 +183,8 @@ struct wlr_surface;
/** /**
* Enables or disables the output. A disabled output is turned off and doesn't * Enables or disables the output. A disabled output is turned off and doesn't
* emit `frame` events. * emit `frame` events.
*
* Whether an output is enabled is double-buffered state, see
* `wlr_output_commit`.
*/ */
void wlr_output_enable(struct wlr_output *output, bool enable); bool wlr_output_enable(struct wlr_output *output, bool enable);
void wlr_output_create_global(struct wlr_output *output); void wlr_output_create_global(struct wlr_output *output);
void wlr_output_destroy_global(struct wlr_output *output); void wlr_output_destroy_global(struct wlr_output *output);
/** /**
@ -217,31 +194,17 @@ void wlr_output_destroy_global(struct wlr_output *output);
struct wlr_output_mode *wlr_output_preferred_mode(struct wlr_output *output); struct wlr_output_mode *wlr_output_preferred_mode(struct wlr_output *output);
/** /**
* Sets the output mode. Enables the output if it's currently disabled. * Sets the output mode. Enables the output if it's currently disabled.
*
* Mode is double-buffered state, see `wlr_output_commit`.
*/ */
void wlr_output_set_mode(struct wlr_output *output, bool wlr_output_set_mode(struct wlr_output *output,
struct wlr_output_mode *mode); struct wlr_output_mode *mode);
/** /**
* Sets a custom mode on the output. If modes are available, they are preferred. * Sets a custom mode on the output. If modes are available, they are preferred.
* Setting `refresh` to zero lets the backend pick a preferred value. * Setting `refresh` to zero lets the backend pick a preferred value.
*
* Custom mode is double-buffered state, see `wlr_output_commit`.
*/ */
void wlr_output_set_custom_mode(struct wlr_output *output, int32_t width, bool wlr_output_set_custom_mode(struct wlr_output *output, int32_t width,
int32_t height, int32_t refresh); int32_t height, int32_t refresh);
/**
* Sets a transform for the output.
*
* Transform is double-buffered state, see `wlr_output_commit`.
*/
void wlr_output_set_transform(struct wlr_output *output, void wlr_output_set_transform(struct wlr_output *output,
enum wl_output_transform transform); enum wl_output_transform transform);
/**
* Sets a scale for the output.
*
* Scale is double-buffered state, see `wlr_output_commit`.
*/
void wlr_output_set_scale(struct wlr_output *output, float scale); void wlr_output_set_scale(struct wlr_output *output, float scale);
void wlr_output_set_subpixel(struct wlr_output *output, void wlr_output_set_subpixel(struct wlr_output *output,
enum wl_output_subpixel subpixel); enum wl_output_subpixel subpixel);
@ -299,8 +262,9 @@ void wlr_output_set_damage(struct wlr_output *output,
pixman_region32_t *damage); pixman_region32_t *damage);
/** /**
* Commit the pending output state. If `wlr_output_attach_render` has been * Commit the pending output state. If `wlr_output_attach_render` has been
* called, the pending frame will be submitted for display and a `frame` event * called, the pending frame will be submitted for display.
* will be scheduled. *
* This function schedules a `frame` event.
*/ */
bool wlr_output_commit(struct wlr_output *output); bool wlr_output_commit(struct wlr_output *output);
/** /**

14
rootston/output.c
Unescape View File

@ -470,10 +470,8 @@ void handle_output_manager_apply(struct wl_listener *listener, void *data) {
wl_list_for_each(config_head, &config->heads, link) { wl_list_for_each(config_head, &config->heads, link) {
struct wlr_output *wlr_output = config_head->state.output; struct wlr_output *wlr_output = config_head->state.output;
if (!config_head->state.enabled) { if (!config_head->state.enabled) {
wlr_output_enable(wlr_output, false); ok &= wlr_output_enable(wlr_output, false);
wlr_output_layout_remove(desktop->layout, wlr_output); wlr_output_layout_remove(desktop->layout, wlr_output);
ok &= wlr_output_commit(wlr_output);
} }
} }
@ -483,12 +481,11 @@ void handle_output_manager_apply(struct wl_listener *listener, void *data) {
if (!config_head->state.enabled) { if (!config_head->state.enabled) {
continue; continue;
} }
ok &= wlr_output_enable(wlr_output, true);
wlr_output_enable(wlr_output, true);
if (config_head->state.mode != NULL) { if (config_head->state.mode != NULL) {
wlr_output_set_mode(wlr_output, config_head->state.mode); ok &= wlr_output_set_mode(wlr_output, config_head->state.mode);
} else { } else {
wlr_output_set_custom_mode(wlr_output, ok &= wlr_output_set_custom_mode(wlr_output,
config_head->state.custom_mode.width, config_head->state.custom_mode.width,
config_head->state.custom_mode.height, config_head->state.custom_mode.height,
config_head->state.custom_mode.refresh); config_head->state.custom_mode.refresh);
@ -497,8 +494,6 @@ void handle_output_manager_apply(struct wl_listener *listener, void *data) {
config_head->state.x, config_head->state.y); config_head->state.x, config_head->state.y);
wlr_output_set_transform(wlr_output, config_head->state.transform); wlr_output_set_transform(wlr_output, config_head->state.transform);
wlr_output_set_scale(wlr_output, config_head->state.scale); wlr_output_set_scale(wlr_output, config_head->state.scale);
ok &= wlr_output_commit(wlr_output);
} }
if (ok) { if (ok) {
@ -679,7 +674,6 @@ void handle_new_output(struct wl_listener *listener, void *data) {
} }
wlr_output_layout_add_auto(desktop->layout, wlr_output); wlr_output_layout_add_auto(desktop->layout, wlr_output);
} }
wlr_output_commit(wlr_output);
struct roots_seat *seat; struct roots_seat *seat;
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {

138
types/wlr_output.c
Unescape View File

@ -154,50 +154,38 @@ static void output_update_matrix(struct wlr_output *output) {
output->height, output->transform); output->height, output->transform);
} }
void wlr_output_enable(struct wlr_output *output, bool enable) { bool wlr_output_enable(struct wlr_output *output, bool enable) {
if (output->enabled == enable) { if (output->enabled == enable) {
return; return true;
} }
output->pending.committed |= WLR_OUTPUT_STATE_ENABLED; if (output->impl->enable) {
output->pending.enabled = enable; return output->impl->enable(output, enable);
}
static void output_state_clear_mode(struct wlr_output_state *state) {
if (!(state->committed & WLR_OUTPUT_STATE_MODE)) {
return;
} }
return false;
state->mode = NULL;
state->committed &= ~WLR_OUTPUT_STATE_MODE;
} }
void wlr_output_set_mode(struct wlr_output *output, bool wlr_output_set_mode(struct wlr_output *output,
struct wlr_output_mode *mode) { struct wlr_output_mode *mode) {
if (!output->impl || !output->impl->set_mode) {
return false;
}
if (output->current_mode == mode) { if (output->current_mode == mode) {
return; return true;
} }
return output->impl->set_mode(output, mode);
output_state_clear_mode(&output->pending);
output->pending.committed |= WLR_OUTPUT_STATE_MODE;
output->pending.mode_type = WLR_OUTPUT_STATE_MODE_FIXED;
output->pending.mode = mode;
} }
void wlr_output_set_custom_mode(struct wlr_output *output, int32_t width, bool wlr_output_set_custom_mode(struct wlr_output *output, int32_t width,
int32_t height, int32_t refresh) { int32_t height, int32_t refresh) {
if (!output->impl || !output->impl->set_custom_mode) {
return false;
}
if (output->width == width && output->height == height && if (output->width == width && output->height == height &&
output->refresh == refresh) { output->refresh == refresh) {
return; return true;
} }
return output->impl->set_custom_mode(output, width, height, refresh);
output_state_clear_mode(&output->pending);
output->pending.committed |= WLR_OUTPUT_STATE_MODE;
output->pending.mode_type = WLR_OUTPUT_STATE_MODE_CUSTOM;
output->pending.custom_mode.width = width;
output->pending.custom_mode.height = height;
output->pending.custom_mode.refresh = refresh;
} }
void wlr_output_update_mode(struct wlr_output *output, void wlr_output_update_mode(struct wlr_output *output,
@ -239,8 +227,16 @@ void wlr_output_set_transform(struct wlr_output *output,
return; return;
} }
output->pending.committed |= WLR_OUTPUT_STATE_TRANSFORM; output->transform = transform;
output->pending.transform = transform; output_update_matrix(output);
struct wl_resource *resource;
wl_resource_for_each(resource, &output->resources) {
send_geometry(resource);
}
wlr_output_schedule_done(output);
wlr_signal_emit_safe(&output->events.transform, output);
} }
void wlr_output_set_scale(struct wlr_output *output, float scale) { void wlr_output_set_scale(struct wlr_output *output, float scale) {
@ -248,8 +244,15 @@ void wlr_output_set_scale(struct wlr_output *output, float scale) {
return; return;
} }
output->pending.committed |= WLR_OUTPUT_STATE_SCALE; output->scale = scale;
output->pending.scale = scale;
struct wl_resource *resource;
wl_resource_for_each(resource, &output->resources) {
send_scale(resource);
}
wlr_output_schedule_done(output);
wlr_signal_emit_safe(&output->events.scale, output);
} }
void wlr_output_set_subpixel(struct wlr_output *output, void wlr_output_set_subpixel(struct wlr_output *output,
@ -455,15 +458,18 @@ static void output_state_clear(struct wlr_output_state *state) {
} }
bool wlr_output_commit(struct wlr_output *output) { bool wlr_output_commit(struct wlr_output *output) {
if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { if (output->frame_pending) {
if (output->frame_pending) { wlr_log(WLR_ERROR, "Tried to commit when a frame is pending");
wlr_log(WLR_ERROR, "Tried to commit a buffer while a frame is pending"); return false;
return false; }
} if (output->idle_frame != NULL) {
if (output->idle_frame != NULL) { wl_event_source_remove(output->idle_frame);
wl_event_source_remove(output->idle_frame); output->idle_frame = NULL;
output->idle_frame = NULL; }
}
if (!(output->pending.committed & WLR_OUTPUT_STATE_BUFFER)) {
wlr_log(WLR_ERROR, "Tried to commit without attaching a buffer");
return false;
} }
struct timespec now; struct timespec now;
@ -480,52 +486,20 @@ bool wlr_output_commit(struct wlr_output *output) {
return false; return false;
} }
if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { struct wlr_output_cursor *cursor;
struct wlr_output_cursor *cursor; wl_list_for_each(cursor, &output->cursors, link) {
wl_list_for_each(cursor, &output->cursors, link) { if (!cursor->enabled || !cursor->visible || cursor->surface == NULL) {
if (!cursor->enabled || !cursor->visible || cursor->surface == NULL) { continue;
continue;
}
wlr_surface_send_frame_done(cursor->surface, &now);
} }
wlr_surface_send_frame_done(cursor->surface, &now);
} }
wlr_signal_emit_safe(&output->events.commit, output); wlr_signal_emit_safe(&output->events.commit, output);
bool scale_updated = output->pending.committed & WLR_OUTPUT_STATE_SCALE; output->frame_pending = true;
if (scale_updated) { output->needs_frame = false;
output->scale = output->pending.scale;
wlr_signal_emit_safe(&output->events.scale, output);
}
if (output->pending.committed & WLR_OUTPUT_STATE_TRANSFORM) {
output->transform = output->pending.transform;
output_update_matrix(output);
wlr_signal_emit_safe(&output->events.transform, output);
}
bool geometry_updated = output->pending.committed &
(WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_TRANSFORM);
if (geometry_updated || scale_updated) {
struct wl_resource *resource;
wl_resource_for_each(resource, &output->resources) {
if (geometry_updated) {
send_geometry(resource);
}
if (scale_updated) {
send_scale(resource);
}
}
wlr_output_schedule_done(output);
}
if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
output->frame_pending = true;
output->needs_frame = false;
pixman_region32_clear(&output->damage);
}
output_state_clear(&output->pending); output_state_clear(&output->pending);
pixman_region32_clear(&output->damage);
return true; return true;
} }

Write Preview
Loading…
Cancel
Save