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

Merge branch 'silence' into 'master'

Browse source 
Vendetta against noisy debug logs

See merge request wlroots/wlroots!4836
This commit is contained in:
Kenny Levinsen 2025-05-07 04:20:28 +00:00
commit a3e92a3f3e
5 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
types/output/cursor.c
View file

@ -205,6 +205,14 @@ static struct wlr_buffer *render_cursor_buffer(struct wlr_output_cursor *cursor)
return NULL;
}
if (sizes == NULL) {
// No cursor support
wlr_log(WLR_DEBUG, "Output '%s' has no cursor support, disabling permanently",
output->name);
output->software_cursor_locks++;
return NULL;
}
bool found = false;
for (size_t i = 0; i < sizes_len; i++) {
struct wlr_output_cursor_size size = sizes[i];
@ -428,7 +436,6 @@ bool output_cursor_set_texture(struct wlr_output_cursor *cursor,
return true;
}
wlr_log(WLR_DEBUG, "Falling back to software cursor on output '%s'", output->name);
output_disable_hardware_cursor(output);
output_cursor_damage_whole(cursor);
return true;

3
types/output/output.c
View file

@ -966,7 +966,6 @@ const struct wlr_drm_format_set *wlr_output_get_primary_formats(
bool wlr_output_is_direct_scanout_allowed(struct wlr_output *output) {
if (output->attach_render_locks > 0) {
wlr_log(WLR_DEBUG, "Direct scan-out disabled by lock");
return false;
}
@ -975,8 +974,6 @@ bool wlr_output_is_direct_scanout_allowed(struct wlr_output *output) {
wl_list_for_each(cursor, &output->cursors, link) {
if (cursor->enabled && cursor->visible &&
cursor != output->hardware_cursor) {
wlr_log(WLR_DEBUG,
"Direct scan-out disabled by software cursor");
return false;
}
}