Commit ad5540f6 authored by Chris Wilson's avatar Chris Wilson 🤔

More ABI changes for ABI_VIDEODRV_VERSION 25.2

Descending down into the naming changes, onto the next struct in the
chain.
Signed-off-by: Chris Wilson's avatarChris Wilson <chris@chris-wilson.co.uk>
parent 4e8ae05f
...@@ -262,8 +262,10 @@ static inline void FreePixmap(PixmapPtr pixmap) ...@@ -262,8 +262,10 @@ static inline void FreePixmap(PixmapPtr pixmap)
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(25, 2) #if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(25, 2)
#define PixmapDirtyDst(d) ((d)->secondary_dst) #define PixmapDirtyDst(d) ((d)->secondary_dst)
#define PixmapDirtyPrimary(d) (PixmapDirtyDst(d)->primary_pixmap)
#else #else
#define PixmapDirtyDst(d) ((d)->slave_dst) #define PixmapDirtyDst(d) ((d)->slave_dst)
#define PixmapDirtyPrimary(d) (PixmapDirtyDst(d)->master_pixmap)
#endif #endif
#endif #endif
...@@ -17696,7 +17696,7 @@ static void sna_accel_post_damage(struct sna *sna) ...@@ -17696,7 +17696,7 @@ static void sna_accel_post_damage(struct sna *sna)
#else #else
src = dirty->src; src = dirty->src;
#endif #endif
dst = PixmapDirtyDst(dirty)->master_pixmap; dst = PixmapDirtyPrimary(dirty);
region.extents.x1 = dirty->x; region.extents.x1 = dirty->x;
region.extents.x2 = dirty->x + dst->drawable.width; region.extents.x2 = dirty->x + dst->drawable.width;
......
...@@ -624,7 +624,7 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) ...@@ -624,7 +624,7 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
RegionRec pixregion; RegionRec pixregion;
int was_blocked; int was_blocked;
PixmapRegionInit(&pixregion, PixmapDirtyDst(dirty)->master_pixmap); PixmapRegionInit(&pixregion, PixmapDirtyPrimary(dirty));
RegionTranslate(&pixregion, dirty->x, dirty->y); RegionTranslate(&pixregion, dirty->x, dirty->y);
RegionIntersect(&pixregion, &pixregion, DamageRegion(dirty->damage)); RegionIntersect(&pixregion, &pixregion, DamageRegion(dirty->damage));
RegionTranslate(&pixregion, -dirty->x, -dirty->y); RegionTranslate(&pixregion, -dirty->x, -dirty->y);
...@@ -634,13 +634,13 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) ...@@ -634,13 +634,13 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
if (was_blocked) if (was_blocked)
return; return;
PixmapRegionInit(&pixregion, PixmapDirtyDst(dirty)->master_pixmap); PixmapRegionInit(&pixregion, PixmapDirtyPrimary(dirty));
PixmapSyncDirtyHelper(dirty, &pixregion); PixmapSyncDirtyHelper(dirty, &pixregion);
RegionUninit(&pixregion); RegionUninit(&pixregion);
intel_flush(intel); intel_flush(intel);
if (!intel->has_prime_vmap_flush) { if (!intel->has_prime_vmap_flush) {
drm_intel_bo *bo = intel_uxa_get_pixmap_bo(PixmapDirtyDst(dirty)->master_pixmap); drm_intel_bo *bo = intel_uxa_get_pixmap_bo(PixmapDirtyPrimary(dirty));
was_blocked = xf86BlockSIGIO(); was_blocked = xf86BlockSIGIO();
drm_intel_bo_map(bo, FALSE); drm_intel_bo_map(bo, FALSE);
drm_intel_bo_unmap(bo); drm_intel_bo_unmap(bo);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment