1 diff --git a/src/compat-api.h b/src/compat-api.h
2 index fde2f4b1cfde75875c07bfe13524dc6ba2661382..8a1fcf9be1c5d1ceb48a50f2ed533d93ec7ff4c7 100644
3 --- a/src/compat-api.h
4 +++ b/src/compat-api.h
5 @@ -102,4 +102,8 @@
6
7 #endif
8
9 +#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
10 +#define secondary_dst slave_dst
11 +#endif
12 +
13 #endif
14 diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
15 index 55df6f8f11c9e14b1891e5c841faef10c17f0a35..db3b112a2db70f8e902e54aa3af99e51e7d0c6f7 100644
16 --- a/src/nouveau_exa.c
17 +++ b/src/nouveau_exa.c
18 @@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv)
19
20 #ifdef NOUVEAU_PIXMAP_SHARING
21 static Bool
22 -nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p)
23 +nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p)
24 {
25 struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
26 struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix);
27 diff --git a/src/nv_driver.c b/src/nv_driver.c
28 index e72a6b65a81119f12f3608295a4547762a866ad7..f9ab4af19361d99d74f580d1ff3f28d49843e8b0 100644
29 --- a/src/nv_driver.c
30 +++ b/src/nv_driver.c
31 @@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
32 {
33 RegionRec pixregion;
34
35 - PixmapRegionInit(&pixregion, dirty->slave_dst);
36 + PixmapRegionInit(&pixregion, dirty->secondary_dst);
37
38 - DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
39 + DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
40 #ifdef HAS_DIRTYTRACKING_ROTATION
41 PixmapSyncDirtyHelper(dirty);
42 #else
43 PixmapSyncDirtyHelper(dirty, &pixregion);
44 #endif
45
46 - DamageRegionProcessPending(&dirty->slave_dst->drawable);
47 + DamageRegionProcessPending(&dirty->secondary_dst->drawable);
48 RegionUninit(&pixregion);
49 }
50
|
