andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glamor: Use MIN/MAX macros to clean up glamor_transfer.c

Browse Source 
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2014-04-02 12:12:06 -07:00
parent 2ab0fba9df
commit 1140a89d77
1 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
glamor/glamor_transfer.c
View File

@ -90,27 +90,14 @@ glamor_upload_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
while (nbox--) {
/* compute drawable coordinates */
int x1 = boxes->x1 + dx_dst;
int x2 = boxes->x2 + dx_dst;
int y1 = boxes->y1 + dy_dst;
int y2 = boxes->y2 + dy_dst;
int x1 = MAX(boxes->x1 + dx_dst, box->x1);
int x2 = MIN(boxes->x2 + dx_dst, box->x2);
int y1 = MAX(boxes->y1 + dy_dst, box->y1);
int y2 = MIN(boxes->y2 + dy_dst, box->y2);
boxes++;
if (x1 < box->x1)
x1 = box->x1;
if (box->x2 < x2)
x2 = box->x2;
if (x2 <= x1)
continue;
if (y1 < box->y1)
y1 = box->y1;
if (box->y2 < y2)
y2 = box->y2;
if (y2 <= y1)
if (x2 <= x1 || y2 <= y1)
continue;
glPixelStorei(GL_UNPACK_SKIP_ROWS, y1 - dy_dst + dy_src);
@ -195,26 +182,14 @@ glamor_download_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
while (nbox--) {
/* compute drawable coordinates */
int x1 = boxes->x1 + dx_src;
int x2 = boxes->x2 + dx_src;
int y1 = boxes->y1 + dy_src;
int y2 = boxes->y2 + dy_src;
int x1 = MAX(boxes->x1 + dx_src, box->x1);
int x2 = MIN(boxes->x2 + dx_src, box->x2);
int y1 = MAX(boxes->y1 + dy_src, box->y1);
int y2 = MIN(boxes->y2 + dy_src, box->y2);
boxes++;
if (x1 < box->x1)
x1 = box->x1;
if (box->x2 < x2)
x2 = box->x2;
if (y1 < box->y1)
y1 = box->y1;
if (box->y2 < y2)
y2 = box->y2;
if (x2 <= x1)
continue;
if (y2 <= y1)
if (x2 <= x1 || y2 <= y1)
continue;
glPixelStorei(GL_PACK_SKIP_PIXELS, x1 - dx_src + dx_dst);