gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Optimize custom cursor image lookup

Browse Source 
Store the images in order from smallest to largest to simplify lookup and be able to early-out of the search loop even if there is no exact match for the scale.
This commit is contained in:
Frank Praznik
2025-10-30 11:05:59 -04:00
parent 6a510d6174
commit 3a59163614
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/wayland/SDL_waylandevents_c.h
View File

@@ -126,7 +126,7 @@ typedef struct SDL_WaylandSeat
struct wl_list link; struct wl_list link;
Uint32 last_implicit_grab_serial; // The serial of the last implicit grab event for window activation and selection data. Uint32 last_implicit_grab_serial; // The serial of the last implicit grab event for window activation and selection data.
Uint32 registry_id; // The ID of the Wayland seat object, Uint32 registry_id; // The ID of the Wayland seat object,
struct struct
{ {

31
src/video/wayland/SDL_waylandmouse.c
View File

@@ -309,23 +309,11 @@ static struct wl_buffer *Wayland_CursorStateGetFrame(SDL_WaylandCursorState *sta
* desired size are preferred over images that are smaller. * desired size are preferred over images that are smaller.
*/ */
CustomCursorImage *closest = NULL; CustomCursorImage *closest = NULL;
int desired_w = (int)SDL_round(data->cursor_data.custom.width * state->scale); const int target_area = SDL_lround(data->cursor_data.custom.width * data->cursor_data.custom.height * state->scale);
int desired_h = (int)SDL_round(data->cursor_data.custom.height * state->scale); int closest_area = 0;
int desired_size = desired_w * desired_h; for (int i = 0; i < data->cursor_data.custom.images_per_frame && closest_area < target_area && data->cursor_data.custom.images[offset + i].buffer; ++i) {
int closest_distance = -1; closest = &data->cursor_data.custom.images[offset + i];
int closest_size = -1; closest_area = closest->width * closest->height;
for (int i = 0; i < data->cursor_data.custom.images_per_frame && closest_distance && data->cursor_data.custom.images[offset + i].buffer; ++i) {
CustomCursorImage *candidate = &data->cursor_data.custom.images[offset + i];
int size = candidate->width * candidate->height;
int delta_w = candidate->width - desired_w;
int delta_h = candidate->height - desired_h;
int distance = (delta_w * delta_w) + (delta_h * delta_h);
if (closest_distance < 0 || distance < closest_distance ||
(size > desired_size && closest_size < desired_size)) {
closest = candidate;
closest_distance = distance;
closest_size = size;
}
} }
return closest ? closest->buffer : NULL; return closest ? closest->buffer : NULL;
@@ -732,6 +720,14 @@ static bool Wayland_GetSystemCursor(SDL_CursorData *cdata, SDL_WaylandCursorStat
return true; return true;
} }
static int surface_sort_callback(const void *a, const void *b)
{
SDL_Surface *s1 = (SDL_Surface *)a;
SDL_Surface *s2 = (SDL_Surface *)b;
return (s1->w * s1->h) <= (s2->w * s2->h) ? -1 : 1;
}
static SDL_Cursor *Wayland_CreateAnimatedCursor(SDL_CursorFrameInfo *frames, int frame_count, int hot_x, int hot_y) static SDL_Cursor *Wayland_CreateAnimatedCursor(SDL_CursorFrameInfo *frames, int frame_count, int hot_x, int hot_y)
{ {
SDL_Cursor *cursor = SDL_calloc(1, sizeof(*cursor)); SDL_Cursor *cursor = SDL_calloc(1, sizeof(*cursor));
@@ -760,6 +756,7 @@ static SDL_Cursor *Wayland_CreateAnimatedCursor(SDL_CursorFrameInfo *frames, int
goto failed; goto failed;
} }
SDL_qsort(surfaces[i].surfaces, surfaces[i].count, sizeof(SDL_Surface *), surface_sort_callback);
max_images = SDL_max(max_images, surfaces[i].count); max_images = SDL_max(max_images, surfaces[i].count);
for (int j = 0; j < surfaces[i].count; ++j) { for (int j = 0; j < surfaces[i].count; ++j) {
pool_size += surfaces[i].surfaces[j]->w * surfaces[i].surfaces[j]->h * 4; pool_size += surfaces[i].surfaces[j]->w * surfaces[i].surfaces[j]->h * 4;