compositor-drm: Fix cursor view size check

Instead of testing against a hardcoded 64x64 pixel size to see if a view
is suitable for promotion to a cursor plane, use our cursor_width and
cursor_height variables.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 28b1c7e..c1c6f00 100644 (file)
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -127,8 +127,8 @@ struct drm_backend {
 
        struct udev_input input;
 
-       uint32_t cursor_width;
-       uint32_t cursor_height;
+       int32_t cursor_width;
+       int32_t cursor_height;
 };
 
 struct drm_mode {
@@ -1081,7 +1081,8 @@ drm_output_prepare_cursor_view(struct drm_output *output,
                return NULL;
        if (ev->surface->buffer_ref.buffer == NULL ||
            !wl_shm_buffer_get(ev->surface->buffer_ref.buffer->resource) ||
-           ev->surface->width > 64 || ev->surface->height > 64)
+           ev->surface->width > b->cursor_width ||
+           ev->surface->height > b->cursor_height)
                return NULL;
 
        output->cursor_view = ev;