From bcf05aee662a891adcd131306e5c9078f1037fca Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 15 May 2024 16:06:04 +0200 Subject: [PATCH] dont check for HAS_DIRTYTRACKING_ROTATION anymore It's always defined since our minimal xserver version 1.18. Signed-off-by: Enrico Weigelt, metux IT consult --- src/drmmode_display.c | 7 +------ src/radeon_kms.c | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index cbb9d6d0..dc7fb1d1 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1357,14 +1357,9 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) PixmapStartDirtyTracking(&ppix->drawable, drmmode_crtc->scanout[scanout_id].pixmap, 0, 0, 0, 0, RR_Rotate_0); -#elif defined(HAS_DIRTYTRACKING_ROTATION) +#else PixmapStartDirtyTracking(ppix, drmmode_crtc->scanout[scanout_id].pixmap, 0, 0, 0, 0, RR_Rotate_0); -#elif defined(HAS_DIRTYTRACKING2) - PixmapStartDirtyTracking2(ppix, drmmode_crtc->scanout[scanout_id].pixmap, - 0, 0, 0, 0); -#else - PixmapStartDirtyTracking(ppix, drmmode_crtc->scanout[scanout_id].pixmap, 0, 0); #endif return TRUE; } diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 4ebf25bf..19d71748 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -557,14 +557,12 @@ dirty_region(PixmapDirtyUpdatePtr dirty) RegionPtr damageregion = DamageRegion(dirty->damage); RegionPtr dstregion; -#ifdef HAS_DIRTYTRACKING_ROTATION if (dirty->rotation != RR_Rotate_0) { dstregion = transform_region(damageregion, &dirty->f_inverse, dirty->secondary_dst->drawable.width, dirty->secondary_dst->drawable.height); } else -#endif { RegionRec pixregion; @@ -590,11 +588,7 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region) if (dirty->secondary_dst->primary_pixmap) DamageRegionAppend(&dirty->secondary_dst->drawable, region); -#ifdef HAS_DIRTYTRACKING_ROTATION PixmapSyncDirtyHelper(dirty); -#else - PixmapSyncDirtyHelper(dirty, region); -#endif radeon_cs_flush_indirect(src_scrn); if (dirty->secondary_dst->primary_pixmap)