From 6f8287128b7bd07b82377df4dcd88a6737e84be2 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 3 Jul 2023 09:46:54 +0200 Subject: [PATCH] output: drop wlr_output_cursor_set_image() This function takes a pointer to memory with a hardcoded format and many parameters to describe the pixel buffer. wlr_output_cursor_set_buffer() can be used instead. --- include/wlr/types/wlr_output.h | 6 ------ types/output/cursor.c | 19 ------------------- 2 files changed, 25 deletions(-) diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index aa3d7a18..f3ed7c10 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -551,12 +551,6 @@ bool wlr_output_is_direct_scanout_allowed(struct wlr_output *output); struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output); -/** - * Sets the cursor image. The image must be already scaled for the output. - */ -bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor, - const uint8_t *pixels, int32_t stride, uint32_t width, uint32_t height, - int32_t hotspot_x, int32_t hotspot_y); bool wlr_output_cursor_set_buffer(struct wlr_output_cursor *cursor, struct wlr_buffer *buffer, int32_t hotspot_x, int32_t hotspot_y); bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, diff --git a/types/output/cursor.c b/types/output/cursor.c index a311e1f0..eb6ac6f2 100644 --- a/types/output/cursor.c +++ b/types/output/cursor.c @@ -390,25 +390,6 @@ static bool output_cursor_attempt_hardware(struct wlr_output_cursor *cursor) { return ok; } -bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor, - const uint8_t *pixels, int32_t stride, uint32_t width, uint32_t height, - int32_t hotspot_x, int32_t hotspot_y) { - struct wlr_buffer *buffer = NULL; - - if (pixels) { - struct wlr_readonly_data_buffer *ro_buffer = readonly_data_buffer_create( - DRM_FORMAT_ARGB8888, stride, width, height, pixels); - if (ro_buffer == NULL) { - return false; - } - buffer = &ro_buffer->base; - } - bool ok = wlr_output_cursor_set_buffer(cursor, buffer, hotspot_x, hotspot_y); - - wlr_buffer_drop(buffer); - return ok; -} - bool wlr_output_cursor_set_buffer(struct wlr_output_cursor *cursor, struct wlr_buffer *buffer, int32_t hotspot_x, int32_t hotspot_y) { struct wlr_renderer *renderer = cursor->output->renderer;