mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-18 06:47:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: remove old frame scheduling

Browse source
This commit is contained in:
Rose Hudson 2023-07-28 11:57:46 +01:00
parent ef710e3fd4
commit e43baf4697
8 changed files with 0 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/drm/drm.c
View file

@ -1709,10 +1709,6 @@ static void handle_page_flip(int fd, unsigned seq,
.flags = present_flags, .flags = present_flags,
}; };
wlr_output_send_present(&conn->output, &present_event); wlr_output_send_present(&conn->output, &present_event);
if (drm->session->active) {
wlr_output_send_frame(&conn->output);
}
} }
int handle_drm_event(int fd, uint32_t mask, void *data) { int handle_drm_event(int fd, uint32_t mask, void *data) {

35
backend/headless/output.c
View file

@ -21,17 +21,6 @@ static struct wlr_headless_output *headless_output_from_output(
return output; return output;
} }
static bool output_set_custom_mode(struct wlr_headless_output *output,
int32_t width, int32_t height, int32_t refresh) {
if (refresh <= 0) {
refresh = HEADLESS_DEFAULT_REFRESH;
}
output->frame_delay = 1000000 / refresh;
return true;
}
static bool output_test(struct wlr_output *wlr_output, static bool output_test(struct wlr_output *wlr_output,
const struct wlr_output_state *state) { const struct wlr_output_state *state) {
uint32_t unsupported = state->committed & ~SUPPORTED_OUTPUT_STATE; uint32_t unsupported = state->committed & ~SUPPORTED_OUTPUT_STATE;
@ -56,30 +45,16 @@ static bool output_test(struct wlr_output *wlr_output,
static bool output_commit(struct wlr_output *wlr_output, static bool output_commit(struct wlr_output *wlr_output,
const struct wlr_output_state *state) { const struct wlr_output_state *state) {
struct wlr_headless_output *output =
headless_output_from_output(wlr_output);
if (!output_test(wlr_output, state)) { if (!output_test(wlr_output, state)) {
return false; return false;
} }
if (state->committed & WLR_OUTPUT_STATE_MODE) {
if (!output_set_custom_mode(output,
state->custom_mode.width,
state->custom_mode.height,
state->custom_mode.refresh)) {
return false;
}
}
if (state->committed & WLR_OUTPUT_STATE_BUFFER) { if (state->committed & WLR_OUTPUT_STATE_BUFFER) {
struct wlr_output_event_present present_event = { struct wlr_output_event_present present_event = {
.commit_seq = wlr_output->commit_seq + 1, .commit_seq = wlr_output->commit_seq + 1,
.presented = true, .presented = true,
}; };
wlr_output_send_present(wlr_output, &present_event); wlr_output_send_present(wlr_output, &present_event);
wl_event_source_timer_update(output->frame_timer, output->frame_delay);
} }
return true; return true;
@ -89,7 +64,6 @@ static void output_destroy(struct wlr_output *wlr_output) {
struct wlr_headless_output *output = struct wlr_headless_output *output =
headless_output_from_output(wlr_output); headless_output_from_output(wlr_output);
wl_list_remove(&output->link); wl_list_remove(&output->link);
wl_event_source_remove(output->frame_timer);
free(output); free(output);
} }
@ -102,12 +76,6 @@ bool wlr_output_is_headless(struct wlr_output *wlr_output) {
return wlr_output->impl == &output_impl; return wlr_output->impl == &output_impl;
} }
static int signal_frame(void *data) {
struct wlr_headless_output *output = data;
wlr_output_send_frame(&output->wlr_output);
return 0;
}
struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend, struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend,
unsigned int width, unsigned int height) { unsigned int width, unsigned int height) {
struct wlr_headless_backend *backend = struct wlr_headless_backend *backend =
@ -139,9 +107,6 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend,
snprintf(description, sizeof(description), "Headless output %zu", output_num); snprintf(description, sizeof(description), "Headless output %zu", output_num);
wlr_output_set_description(wlr_output, description); wlr_output_set_description(wlr_output, description);
struct wl_event_loop *ev = wl_display_get_event_loop(backend->display);
output->frame_timer = wl_event_loop_add_timer(ev, signal_frame, output);
wl_list_insert(&backend->outputs, &output->link); wl_list_insert(&backend->outputs, &output->link);
if (backend->started) { if (backend->started) {

2
backend/wayland/output.c
View file

@ -69,8 +69,6 @@ static void surface_frame_callback(void *data, struct wl_callback *cb,
assert(output->frame_callback == cb); assert(output->frame_callback == cb);
wl_callback_destroy(cb); wl_callback_destroy(cb);
output->frame_callback = NULL; output->frame_callback = NULL;
wlr_output_send_frame(&output->wlr_output);
} }
static const struct wl_callback_listener frame_listener = { static const struct wl_callback_listener frame_listener = {

2
backend/x11/output.c
View file

@ -729,8 +729,6 @@ void handle_x11_present_event(struct wlr_x11_backend *x11,
.flags = flags, .flags = flags,
}; };
wlr_output_send_present(&output->wlr_output, &present_event); wlr_output_send_present(&output->wlr_output, &present_event);
wlr_output_send_frame(&output->wlr_output);
break; break;
default: default:
wlr_log(WLR_DEBUG, "Unhandled Present event %"PRIu16, event->event_type); wlr_log(WLR_DEBUG, "Unhandled Present event %"PRIu16, event->event_type);

5
include/backend/headless.h
View file

@ -4,8 +4,6 @@
#include <wlr/backend/headless.h> #include <wlr/backend/headless.h>
#include <wlr/backend/interface.h> #include <wlr/backend/interface.h>
#define HEADLESS_DEFAULT_REFRESH (60 * 1000) // 60 Hz
struct wlr_headless_backend { struct wlr_headless_backend {
struct wlr_backend backend; struct wlr_backend backend;
struct wl_display *display; struct wl_display *display;
@ -19,9 +17,6 @@ struct wlr_headless_output {
struct wlr_headless_backend *backend; struct wlr_headless_backend *backend;
struct wl_list link; struct wl_list link;
struct wl_event_source *frame_timer;
int frame_delay; // ms
}; };
struct wlr_headless_backend *headless_backend_from_backend( struct wlr_headless_backend *headless_backend_from_backend(

6
include/wlr/interfaces/wlr_output.h
View file

@ -108,12 +108,6 @@ void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
* output changes. * output changes.
*/ */
void wlr_output_update_needs_frame(struct wlr_output *output); void wlr_output_update_needs_frame(struct wlr_output *output);
/**
* Send a frame event.
*
* See wlr_output.events.frame.
*/
void wlr_output_send_frame(struct wlr_output *output);
/** /**
* Send a present event. * Send a present event.
* *

10
include/wlr/types/wlr_output.h
View file

@ -145,8 +145,6 @@ struct wlr_output {
uint32_t render_format; uint32_t render_format;
bool needs_frame; bool needs_frame;
// damage for cursors and fullscreen surface, in output-local coordinates
bool frame_pending;
float transform_matrix[9]; float transform_matrix[9];
// true for example with VR headsets // true for example with VR headsets
@ -158,8 +156,6 @@ struct wlr_output {
uint32_t commit_seq; uint32_t commit_seq;
struct { struct {
// Request to render a frame
struct wl_signal frame;
// Emitted when software cursors or backend-specific logic damage the // Emitted when software cursors or backend-specific logic damage the
// output // output
struct wl_signal damage; // struct wlr_output_event_damage struct wl_signal damage; // struct wlr_output_event_damage
@ -179,7 +175,6 @@ struct wlr_output {
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;
struct wl_event_source *idle_frame;
struct wl_event_source *idle_done; struct wl_event_source *idle_done;
int attach_render_locks; // number of locks forcing rendering int attach_render_locks; // number of locks forcing rendering
@ -477,11 +472,6 @@ bool wlr_output_test_state(struct wlr_output *output,
*/ */
bool wlr_output_commit_state(struct wlr_output *output, bool wlr_output_commit_state(struct wlr_output *output,
const struct wlr_output_state *state); const struct wlr_output_state *state);
/**
* Manually schedules a `frame` event. If a `frame` event is already pending,
* it is a no-op.
*/
void wlr_output_schedule_frame(struct wlr_output *output);
/** /**
* Returns the maximum length of each gamma ramp, or 0 if unsupported. * Returns the maximum length of each gamma ramp, or 0 if unsupported.
*/ */

49
types/output/output.c
View file

@ -319,11 +319,6 @@ static void output_apply_state(struct wlr_output *output,
output->cursor_swapchain = NULL; output->cursor_swapchain = NULL;
} }
if (state->committed & WLR_OUTPUT_STATE_BUFFER) {
output->frame_pending = true;
output->needs_frame = false;
}
if (state->committed & WLR_OUTPUT_STATE_LAYERS) { if (state->committed & WLR_OUTPUT_STATE_LAYERS) {
for (size_t i = 0; i < state->layers_len; i++) { for (size_t i = 0; i < state->layers_len; i++) {
struct wlr_output_layer_state *layer_state = &state->layers[i]; struct wlr_output_layer_state *layer_state = &state->layers[i];
@ -422,7 +417,6 @@ void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
wl_list_init(&output->cursors); wl_list_init(&output->cursors);
wl_list_init(&output->layers); wl_list_init(&output->layers);
wl_list_init(&output->resources); wl_list_init(&output->resources);
wl_signal_init(&output->events.frame);
wl_signal_init(&output->events.damage); wl_signal_init(&output->events.damage);
wl_signal_init(&output->events.needs_frame); wl_signal_init(&output->events.needs_frame);
wl_signal_init(&output->events.precommit); wl_signal_init(&output->events.precommit);
@ -478,10 +472,6 @@ void wlr_output_destroy(struct wlr_output *output) {
wlr_swapchain_destroy(output->swapchain); wlr_swapchain_destroy(output->swapchain);
if (output->idle_frame != NULL) {
wl_event_source_remove(output->idle_frame);
}
if (output->idle_done != NULL) { if (output->idle_done != NULL) {
wl_event_source_remove(output->idle_done); wl_event_source_remove(output->idle_done);
} }
@ -792,12 +782,6 @@ bool wlr_output_commit_state(struct wlr_output *output,
return false; return false;
} }
if ((pending.committed & WLR_OUTPUT_STATE_BUFFER) &&
output->idle_frame != NULL) {
wl_event_source_remove(output->idle_frame);
output->idle_frame = NULL;
}
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
@ -862,39 +846,6 @@ void wlr_output_attach_buffer(struct wlr_output *output,
wlr_output_state_set_buffer(&output->pending, buffer); wlr_output_state_set_buffer(&output->pending, buffer);
} }
void wlr_output_send_frame(struct wlr_output *output) {
output->frame_pending = false;
if (output->enabled) {
wl_signal_emit_mutable(&output->events.frame, output);
}
}
static void schedule_frame_handle_idle_timer(void *data) {
struct wlr_output *output = data;
output->idle_frame = NULL;
if (!output->frame_pending) {
wlr_output_send_frame(output);
}
}
void wlr_output_schedule_frame(struct wlr_output *output) {
// Make sure the compositor commits a new frame. This is necessary to make
// clients which ask for frame callbacks without submitting a new buffer
// work.
// TODO(rose): figure out why
wlr_output_update_needs_frame(output);
if (output->frame_pending || output->idle_frame != NULL) {
return;
}
// We're using an idle timer here in case a buffer swap happens right after
// this function is called
struct wl_event_loop *ev = wl_display_get_event_loop(output->display);
output->idle_frame =
wl_event_loop_add_idle(ev, schedule_frame_handle_idle_timer, output);
}
void wlr_output_send_present(struct wlr_output *output, void wlr_output_send_present(struct wlr_output *output,
struct wlr_output_event_present *event) { struct wlr_output_event_present *event) {
assert(event); assert(event);