Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna/dri: Compensate clipExtents for drawable offset 

The clipExtents is in screen coordinates whereas we just want to confirm
that the maximum pixel to be copied lies with the DRI2 buffer, which is
relative to the drawable.

Reported-by: Matthieu Baerts <matttbe@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59806
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-01-24 15:41:29 +00:00
parent 264b3b7250
commit d60128c55e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/sna/sna_dri.c
View File

@ -842,20 +842,31 @@ can_blit(struct sna * sna,
DRI2BufferPtr back)
{
RegionPtr clip;
int w, h;
uint32_t s;
if (draw->type == DRAWABLE_PIXMAP)
return true;
clip = &((WindowPtr)draw)->clipList;
w = clip->extents.x2 - draw->x;
h = clip->extents.y2 - draw->y;
if ((w|h) < 0)
return false;
s = get_private(front)->size;
if ((s>>16) < clip->extents.y2 || (s&0xffff) < clip->extents.x2)
if ((s>>16) < h || (s&0xffff) < w) {
DBG(("%s: reject front size (%dx%d) < (%dx%d)\n", __func__,
s&0xffff, s>>16, w, h));
return false;
}
s = get_private(back)->size;
if ((s>>16) < clip->extents.y2 || (s&0xffff) < clip->extents.x2)
if ((s>>16) < h || (s&0xffff) < w) {
DBG(("%s:reject back size (%dx%d) < (%dx%d)\n", __func__,
s&0xffff, s>>16, w, h));
return false;
}
return true;
}