geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r500: suggestion from glisse to not add cliprect offset on r5xx

main
Dave Airlie 2007-11-21 13:02:19 +10:00
parent dc0ec76d60
commit 5ec64d4a30
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
shared-core/r300_cmdbuf.c
View File

@ -77,23 +77,31 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,
return -EFAULT; return -EFAULT;
} }
box.x1 = if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) {
(box.x1 + box.x1 = (box.x1) &
R300_CLIPRECT_OFFSET) & R300_CLIPRECT_MASK; R300_CLIPRECT_MASK;
box.y1 = box.y1 = (box.y1) &
(box.y1 + R300_CLIPRECT_MASK;
R300_CLIPRECT_OFFSET) & R300_CLIPRECT_MASK; box.x2 = (box.x2) &
box.x2 = R300_CLIPRECT_MASK;
(box.x2 + box.y2 = (box.y2) &
R300_CLIPRECT_OFFSET) & R300_CLIPRECT_MASK; R300_CLIPRECT_MASK;
box.y2 = } else {
(box.y2 + box.x1 = (box.x1 + R300_CLIPRECT_OFFSET) &
R300_CLIPRECT_OFFSET) & R300_CLIPRECT_MASK; R300_CLIPRECT_MASK;
box.y1 = (box.y1 + R300_CLIPRECT_OFFSET) &
R300_CLIPRECT_MASK;
box.x2 = (box.x2 + R300_CLIPRECT_OFFSET) &
R300_CLIPRECT_MASK;
box.y2 = (box.y2 + R300_CLIPRECT_OFFSET) &
R300_CLIPRECT_MASK;
}
OUT_RING((box.x1 << R300_CLIPRECT_X_SHIFT) | OUT_RING((box.x1 << R300_CLIPRECT_X_SHIFT) |
(box.y1 << R300_CLIPRECT_Y_SHIFT)); (box.y1 << R300_CLIPRECT_Y_SHIFT));
OUT_RING((box.x2 << R300_CLIPRECT_X_SHIFT) | OUT_RING((box.x2 << R300_CLIPRECT_X_SHIFT) |
(box.y2 << R300_CLIPRECT_Y_SHIFT)); (box.y2 << R300_CLIPRECT_Y_SHIFT));
} }
OUT_RING_REG(R300_RE_CLIPRECT_CNTL, r300_cliprect_cntl[nr - 1]); OUT_RING_REG(R300_RE_CLIPRECT_CNTL, r300_cliprect_cntl[nr - 1]);