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

sna: Fix the usual "x = y" typos in creating boxes 

Fixes regression from

commit 1d74b2e07d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue Jun 24 08:58:51 2014 +0100

    sna: Decompose self-copy into overlapping/non-overlapping regions

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-06-24 11:04:01 +01:00
parent 92119ef093
commit 92dd13ae8d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sna/sna_render.c
View File

@ -2205,7 +2205,7 @@ sna_render_copy_boxes__overlap(struct sna *sna, uint8_t alu,
region.extents.x1 = extents->x1 + dst_dx;
region.extents.x2 = extents->x2 + dst_dx;
region.extents.y1 = extents->y1 + dst_dy;
region.extents.y2 = extents->x2 + dst_dy;
region.extents.y2 = extents->y2 + dst_dy;
for (i = num_boxes = 0; i < n; i++) {
boxes[num_boxes].x1 = box[i].x1 + dst_dx;
@ -2216,7 +2216,7 @@ sna_render_copy_boxes__overlap(struct sna *sna, uint8_t alu,
if (boxes[num_boxes].y1 < region.extents.y1)
boxes[num_boxes].y1 = region.extents.y1;
boxes[num_boxes].x2 = box[i].x2 + dst_dy;
boxes[num_boxes].x2 = box[i].x2 + dst_dx;
if (boxes[num_boxes].x2 > region.extents.x2)
boxes[num_boxes].x2 = region.extents.x2;
@ -2240,7 +2240,7 @@ sna_render_copy_boxes__overlap(struct sna *sna, uint8_t alu,
overlap.extents.x1 = extents->x1 + src_dx;
overlap.extents.x2 = extents->x2 + src_dx;
overlap.extents.y1 = extents->y1 + src_dy;
overlap.extents.y2 = extents->x2 + src_dy;
overlap.extents.y2 = extents->y2 + src_dy;
overlap.data = NULL;
RegionIntersect(&overlap, &overlap, &region);