x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch

78 @@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
80  extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
82 -extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
83 +extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
91 @@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
93  extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
95 -extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
96 +extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
106  static inline ScreenPtr
107 -radeon_master_screen(ScreenPtr screen)
108 +radeon_primary_screen(ScreenPtr screen)
118  static inline ScreenPtr
131 @@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
135 -Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle)
136 +Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle)
148 -radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave,
149 +radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary,
152  	ScreenPtr screen = pixmap->drawable.pScreen;
203 -    ScreenPtr master_screen = radeon_dirty_master(dirty);
204 +    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
222 -    ScreenPtr master_screen = radeon_dirty_master(dirty);
223 +    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
233 -    ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
234 +    ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen;
243 -    ScreenPtr master_screen = radeon_dirty_master(dirty);
244 +    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
279 -    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
280 +    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
312 -    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
313 +    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
321 -    ScreenPtr screen = ent->slave_dst->drawable.pScreen;
322 +    ScreenPtr screen = ent->secondary_dst->drawable.pScreen;
331 -				ScreenPtr master_screen = radeon_dirty_master(ent);
333 +				ScreenPtr primary_screen = radeon_dirty_primary(ent);