mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: Remove redundant cursor region math

Browse Source 
We already check this in weston_output_set_cursor().
This commit is contained in:
Kristian Høgsberg 2012-02-24 11:03:27 -05:00
parent ca14ef049d
commit 4d7c862278
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/compositor-drm.c
View File

@ -637,7 +637,6 @@ drm_output_set_cursor(struct weston_output *output_base,
(struct drm_compositor *) output->base.compositor; (struct drm_compositor *) output->base.compositor;
EGLint handle, stride; EGLint handle, stride;
int ret = -1; int ret = -1;
pixman_region32_t cursor_region;
struct gbm_bo *bo; struct gbm_bo *bo;
if (eid == NULL) { if (eid == NULL) {
@ -645,20 +644,6 @@ drm_output_set_cursor(struct weston_output *output_base,
return 0; return 0;
} }
pixman_region32_init_rect(&cursor_region,
eid->sprite->geometry.x,
eid->sprite->geometry.y,
eid->sprite->geometry.width,
eid->sprite->geometry.height);
pixman_region32_intersect_rect(&cursor_region, &cursor_region,
output->base.x, output->base.y,
output->base.current->width,
output->base.current->height);
if (!pixman_region32_not_empty(&cursor_region))
goto out;
if (eid->sprite->image == EGL_NO_IMAGE_KHR) if (eid->sprite->image == EGL_NO_IMAGE_KHR)
goto out; goto out;
@ -698,7 +683,6 @@ drm_output_set_cursor(struct weston_output *output_base,
} }
out: out:
pixman_region32_fini(&cursor_region);
if (ret) if (ret)
drmModeSetCursor(c->drm.fd, output->crtc_id, 0, 0, 0); drmModeSetCursor(c->drm.fd, output->crtc_id, 0, 0, 0);
return ret; return ret;