diff options
| author | Simon Ser <contact@emersion.fr> | 2020-12-25 12:21:29 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-12-25 12:21:29 +0100 |
| commit | b9460ab724fb8df18d22cb0e10cf6e07646fc1cf (patch) | |
| tree | 0ec73b0989d250debb08d6576c2477c104e28284 /backend | |
| parent | ae5275c09fbd2cce326dee2b6d13fd8b9cdc08aa (diff) | |
Stop using wlr_texture_get_size
Just use wlr_texture.{width,height} directly.
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/drm.c | 6 | ||||
| -rw-r--r-- | backend/wayland/output.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 26cf99df..06a58d50 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -915,10 +915,8 @@ static bool drm_connector_set_cursor(struct wlr_output *output, plane->cursor_enabled = false; if (texture != NULL) { - int width, height; - wlr_texture_get_size(texture, &width, &height); - width = width * output->scale / scale; - height = height * output->scale / scale; + int width = texture->width * output->scale / scale; + int height = texture->height * output->scale / scale; if (width > (int)plane->surf.width || height > (int)plane->surf.height) { wlr_drm_conn_log(conn, WLR_ERROR, "Cursor too large (max %dx%d)", diff --git a/backend/wayland/output.c b/backend/wayland/output.c index db9056d5..6bc84dcb 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -402,10 +402,8 @@ static bool output_set_cursor(struct wlr_output *wlr_output, struct wl_surface *surface = output->cursor.surface; if (texture != NULL) { - int width, height; - wlr_texture_get_size(texture, &width, &height); - width = width * wlr_output->scale / scale; - height = height * wlr_output->scale / scale; + int width = texture->width * wlr_output->scale / scale; + int height = texture->height * wlr_output->scale / scale; if (output->cursor.swapchain == NULL || output->cursor.swapchain->width != width || |