summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2010-02-15 16:44:39 +0100
committerMichel Dänzer <michel@daenzer.net>2010-02-15 17:10:06 +0100
commit47136fa347d1756523239746b4c74cd5278a1118 (patch)
tree1795f1cb4a30f555e3c5bd368d24f365886c36d6
parent6e95905f759b844373be62ec513c78153ed00222 (diff)
EXA: Fix order of coordinates passed to radeon_pick_best_crtc().
The wrong order prevented tearing avoidance from working with EXA/DRI2.
-rw-r--r--src/r600_exa.c2
-rw-r--r--src/radeon_exa_funcs.c6
-rw-r--r--src/radeon_exa_render.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/r600_exa.c b/src/r600_exa.c
index ddbbb533..5ed9c07f 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -110,7 +110,7 @@ static void R600VlineHelperSet(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2
RADEONInfoPtr info = RADEONPTR(pScrn);
struct radeon_accel_state *accel_state = info->accel_state;
- accel_state->vline_crtc = radeon_pick_best_crtc(pScrn, x1, y1, x2, y2);
+ accel_state->vline_crtc = radeon_pick_best_crtc(pScrn, x1, x2, y1, y2);
if (accel_state->vline_y1 == -1)
accel_state->vline_y1 = y1;
if (y1 < accel_state->vline_y1)
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index a3098d8f..5806d3b1 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -227,7 +227,7 @@ FUNC_NAME(RADEONSolid)(PixmapPtr pPix, int x1, int y1, int x2, int y2)
if (info->accel_state->vsync)
FUNC_NAME(RADEONWaitForVLine)(pScrn, pPix,
- radeon_pick_best_crtc(pScrn, x1, y1, x2, y2),
+ radeon_pick_best_crtc(pScrn, x1, x2, y1, y2),
y1, y2);
BEGIN_ACCEL(2);
@@ -348,7 +348,7 @@ FUNC_NAME(RADEONCopy)(PixmapPtr pDst,
if (info->accel_state->vsync)
FUNC_NAME(RADEONWaitForVLine)(pScrn, pDst,
- radeon_pick_best_crtc(pScrn, dstX, dstY, dstX + w, dstY + h),
+ radeon_pick_best_crtc(pScrn, dstX, dstX + w, dstY, dstY + h),
dstY, dstY + h);
BEGIN_ACCEL(3);
@@ -386,7 +386,7 @@ RADEONUploadToScreenCP(PixmapPtr pDst, int x, int y, int w, int h,
if (info->accel_state->vsync)
FUNC_NAME(RADEONWaitForVLine)(pScrn, pDst,
- radeon_pick_best_crtc(pScrn, x, y, x + w, y + h),
+ radeon_pick_best_crtc(pScrn, x, x + w, y, y + h),
y, y + h);
while ((buf = RADEONHostDataBlit(pScrn,
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 7f350fb6..15f4326f 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -2256,7 +2256,7 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn,
if (info->accel_state->vsync)
FUNC_NAME(RADEONWaitForVLine)(pScrn, pDst,
- radeon_pick_best_crtc(pScrn, dstX, dstY, dstX + w, dstY + h),
+ radeon_pick_best_crtc(pScrn, dstX, dstX + w, dstY, dstY + h),
dstY, dstY + h);
#ifdef ACCEL_CP