mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: add output_state_{init,finish}

Browse source
This commit is contained in:
Simon Ser 2022-05-27 11:35:33 +02:00
parent b21c26a1c9
commit 501ac5398d
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
types/output/output.c
View file

@ -382,6 +382,21 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
wlr_output_destroy_global(output); wlr_output_destroy_global(output);
} }
static void output_state_init(struct wlr_output_state *state) {
memset(state, 0, sizeof(*state));
pixman_region32_init(&state->damage);
}
static void output_state_finish(struct wlr_output_state *state) {
wlr_buffer_unlock(state->buffer);
// struct wlr_buffer is ref'counted, so the pointer may remain valid after
// wlr_buffer_unlock(). Reset the field to NULL to ensure nobody mistakenly
// reads it after output_state_finish().
state->buffer = NULL;
pixman_region32_fini(&state->damage);
free(state->gamma_lut);
}
void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend, void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
const struct wlr_output_impl *impl, struct wl_display *display) { const struct wlr_output_impl *impl, struct wl_display *display) {
assert(impl->commit); assert(impl->commit);
@ -411,7 +426,7 @@ void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
wl_signal_init(&output->events.mode); wl_signal_init(&output->events.mode);
wl_signal_init(&output->events.description); wl_signal_init(&output->events.description);
wl_signal_init(&output->events.destroy); wl_signal_init(&output->events.destroy);
pixman_region32_init(&output->pending.damage); output_state_init(&output->pending);
const char *no_hardware_cursors = getenv("WLR_NO_HARDWARE_CURSORS"); const char *no_hardware_cursors = getenv("WLR_NO_HARDWARE_CURSORS");
if (no_hardware_cursors != NULL && strcmp(no_hardware_cursors, "1") == 0) { if (no_hardware_cursors != NULL && strcmp(no_hardware_cursors, "1") == 0) {
@ -461,7 +476,7 @@ void wlr_output_destroy(struct wlr_output *output) {
free(output->name); free(output->name);
free(output->description); free(output->description);
pixman_region32_fini(&output->pending.damage); output_state_finish(&output->pending);
if (output->impl && output->impl->destroy) { if (output->impl && output->impl->destroy) {
output->impl->destroy(output); output->impl->destroy(output);