mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-18 06:46:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: remove DRM backend check and frame timing modification for tearing

Browse source
This commit is contained in:
Ricardo Steijn 2024-08-04 18:44:21 +02:00
parent 3bb8cd62a4
commit c810995119
1 changed files with 6 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

37
sway/desktop/output.c
View file

@ -141,26 +141,11 @@ static struct buffer_timer *buffer_timer_get_or_create(struct wlr_scene_buffer *
return timer; return timer;
} }
static bool output_can_tear_fullscreen_view(struct sway_output *output,
struct sway_view *view) {
if (!view) {
return false;
}
#ifdef WLR_HAS_DRM_BACKEND
if (wlr_backend_is_drm(output->wlr_output->backend) &&
output->allow_tearing && view_can_tear(view)) {
return true;
}
#endif
return false;
}
static void send_frame_done_iterator(struct wlr_scene_buffer *buffer, static void send_frame_done_iterator(struct wlr_scene_buffer *buffer,
int x, int y, void *user_data) { int x, int y, void *user_data) {
struct send_frame_done_data *data = user_data; struct send_frame_done_data *data = user_data;
struct sway_output *output = data->output; struct sway_output *output = data->output;
int view_max_render_time = 0; int view_max_render_time = 0;
bool view_can_tear = false;
if (buffer->primary_output != data->output->scene_output) { if (buffer->primary_output != data->output->scene_output) {
return; return;
@ -172,10 +157,6 @@ static void send_frame_done_iterator(struct wlr_scene_buffer *buffer,
SWAY_SCENE_DESC_VIEW); SWAY_SCENE_DESC_VIEW);
if (view) { if (view) {
view_max_render_time = view->max_render_time; view_max_render_time = view->max_render_time;
if (view->container && container_is_fullscreen_or_child(view->container)) {
view_can_tear = output_can_tear_fullscreen_view(output, view);
}
break; break;
} }
@ -189,10 +170,6 @@ static void send_frame_done_iterator(struct wlr_scene_buffer *buffer,
int delay = data->msec_until_refresh - output->max_render_time int delay = data->msec_until_refresh - output->max_render_time
- view_max_render_time; - view_max_render_time;
if (view_can_tear) {
delay = 0;
}
struct buffer_timer *timer = NULL; struct buffer_timer *timer = NULL;
if (output->max_render_time != 0 && view_max_render_time != 0 && delay > 0) { if (output->max_render_time != 0 && view_max_render_time != 0 && delay > 0) {
@ -317,22 +294,21 @@ static int output_repaint_timer_handler(void *data) {
return 0; return 0;
} }
static struct sway_view *output_get_fullscreen_view( static bool output_can_tear(struct sway_output *output) {
struct sway_output *output) {
struct sway_workspace *workspace = output->current.active_workspace; struct sway_workspace *workspace = output->current.active_workspace;
if (!workspace) { if (!workspace) {
return NULL; return false;
} }
struct sway_container *fullscreen_con = root->fullscreen_global; struct sway_container *fullscreen_con = root->fullscreen_global;
if (!fullscreen_con) { if (!fullscreen_con) {
fullscreen_con = workspace->current.fullscreen; fullscreen_con = workspace->current.fullscreen;
} }
if (fullscreen_con) { if (fullscreen_con && fullscreen_con->view) {
return fullscreen_con->view; return (output->allow_tearing && view_can_tear(fullscreen_con->view));
} }
return NULL; return false;
} }
static void handle_frame(struct wl_listener *listener, void *user_data) { static void handle_frame(struct wl_listener *listener, void *user_data) {
@ -382,8 +358,7 @@ static void handle_frame(struct wl_listener *listener, void *user_data) {
int delay = msec_until_refresh - output->max_render_time; int delay = msec_until_refresh - output->max_render_time;
struct sway_view *fullscreen_view = output_get_fullscreen_view(output); output->enable_tearing = output_can_tear(output);
output->enable_tearing = output_can_tear_fullscreen_view(output, fullscreen_view);
// If the delay is less than 1 millisecond (which is the least we can wait) // If the delay is less than 1 millisecond (which is the least we can wait)
// or if the output is allowed to tear, then just render right away. // or if the output is allowed to tear, then just render right away.