From 15b7738389b36ec2739d4f599539bcb7c2be89a1 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 6 Jul 2020 07:00:04 +1000 Subject: [PATCH] exa: rename some badly named variables Reviewed-by: Peter Hutterer --- exa/exa.h | 2 +- exa/exa_mixed.c | 4 ++-- exa/exa_priv.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/exa/exa.h b/exa/exa.h index 288d9ac66..fba06ca0f 100644 --- a/exa/exa.h +++ b/exa/exa.h @@ -694,7 +694,7 @@ typedef struct _ExaDriver { int depth, int usage_hint, int bitsPerPixel, int *new_fb_pitch); /** @} */ - Bool (*SharePixmapBacking)(PixmapPtr pPixmap, ScreenPtr slave, void **handle_p); + Bool (*SharePixmapBacking)(PixmapPtr pPixmap, ScreenPtr secondary, void **handle_p); Bool (*SetSharedPixmapBacking)(PixmapPtr pPixmap, void *handle); diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c index f618a1ea8..1e67ec23a 100644 --- a/exa/exa_mixed.c +++ b/exa/exa_mixed.c @@ -297,7 +297,7 @@ exaPixmapHasGpuCopy_mixed(PixmapPtr pPixmap) } Bool -exaSharePixmapBacking_mixed(PixmapPtr pPixmap, ScreenPtr slave, void **handle_p) +exaSharePixmapBacking_mixed(PixmapPtr pPixmap, ScreenPtr secondary, void **handle_p) { ScreenPtr pScreen = pPixmap->drawable.pScreen; ExaScreenPriv(pScreen); @@ -306,7 +306,7 @@ exaSharePixmapBacking_mixed(PixmapPtr pPixmap, ScreenPtr slave, void **handle_p) exaMoveInPixmap(pPixmap); /* get the driver to give us a handle */ if (pExaScr->info->SharePixmapBacking) - ret = pExaScr->info->SharePixmapBacking(pPixmap, slave, handle_p); + ret = pExaScr->info->SharePixmapBacking(pPixmap, secondary, handle_p); return ret; } diff --git a/exa/exa_priv.h b/exa/exa_priv.h index 8414bd857..4468487e6 100644 --- a/exa/exa_priv.h +++ b/exa/exa_priv.h @@ -658,7 +658,7 @@ void Bool exaSetSharedPixmapBacking_mixed(PixmapPtr pPixmap, void *handle); Bool -exaSharePixmapBacking_mixed(PixmapPtr pPixmap, ScreenPtr slave, void **handle_p); +exaSharePixmapBacking_mixed(PixmapPtr pPixmap, ScreenPtr secondary, void **handle_p); /* exa_render.c */ Bool