From 93ea74e53e13890ea2f85ea57e9455d0eb2525f4 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 11 Mar 2017 00:53:01 +0100 Subject: xserver: remove index from CloseScreen (API/ABI breakage) Extracted from X.org bulk commit: commit 1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5 Author: Dave Airlie Date: Tue Jun 5 13:22:18 2012 +0100 api: rework the X server driver API to avoid global arrays. This is a squash merge containing all the API changes, as well as the video ABI bump. Its been squashed to make bisection easier. Full patch log below: [...] commit 06729dbbc804a20242e6499f446acb5d94023c3c Author: Dave Airlie Date: Tue Apr 10 14:04:59 2012 +0100 xserver: remove index from CloseScreen (API/ABI breakage) This drops the index from the CloseScreen callback, its always been useless really, since the pScreen contains it. Reviewed-by: Alan Coopersmith Acked-by: Aaron Plattner Reviewed-by: Adam Jackson Signed-off-by: Dave Airlie --- nx-X11/programs/Xserver/Xext/panoramiX.c | 4 ++-- nx-X11/programs/Xserver/Xext/xvdix.h | 2 +- nx-X11/programs/Xserver/Xext/xvmain.c | 7 +++---- nx-X11/programs/Xserver/Xext/xvmc.c | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'nx-X11/programs/Xserver/Xext') diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c index 3809890bc..e720965d4 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.c +++ b/nx-X11/programs/Xserver/Xext/panoramiX.c @@ -149,7 +149,7 @@ GCFuncs XineramaGCFuncs = { static Bool -XineramaCloseScreen (int i, ScreenPtr pScreen) +XineramaCloseScreen (ScreenPtr pScreen) { PanoramiXScreenPtr pScreenPriv = (PanoramiXScreenPtr) pScreen->devPrivates[PanoramiXScreenIndex].ptr; @@ -163,7 +163,7 @@ XineramaCloseScreen (int i, ScreenPtr pScreen) free ((void *) pScreenPriv); - return (*pScreen->CloseScreen) (i, pScreen); + return (*pScreen->CloseScreen) (pScreen); } Bool diff --git a/nx-X11/programs/Xserver/Xext/xvdix.h b/nx-X11/programs/Xserver/Xext/xvdix.h index 4e8fbb507..973c39b76 100644 --- a/nx-X11/programs/Xserver/Xext/xvdix.h +++ b/nx-X11/programs/Xserver/Xext/xvdix.h @@ -219,7 +219,7 @@ typedef struct { DestroyWindowProcPtr DestroyWindow; DestroyPixmapProcPtr DestroyPixmap; CloseScreenProcPtr CloseScreen; - Bool (* ddCloseScreen)(int, ScreenPtr); + Bool (* ddCloseScreen)(ScreenPtr); int (* ddQueryAdaptors)(ScreenPtr, XvAdaptorPtr*, int*); DevUnion devPriv; } XvScreenRec, *XvScreenPtr; diff --git a/nx-X11/programs/Xserver/Xext/xvmain.c b/nx-X11/programs/Xserver/Xext/xvmain.c index 3eea84c76..397f8dc81 100644 --- a/nx-X11/programs/Xserver/Xext/xvmain.c +++ b/nx-X11/programs/Xserver/Xext/xvmain.c @@ -131,7 +131,7 @@ static void WriteSwappedVideoNotifyEvent(xvEvent *, xvEvent *); static void WriteSwappedPortNotifyEvent(xvEvent *, xvEvent *); static Bool CreateResourceTypes(void); -static Bool XvCloseScreen(int, ScreenPtr); +static Bool XvCloseScreen(ScreenPtr); static Bool XvDestroyPixmap(PixmapPtr); static Bool XvDestroyWindow(WindowPtr); static void XvResetProc(ExtensionEntry*); @@ -307,7 +307,6 @@ XvScreenInit(ScreenPtr pScreen) static Bool XvCloseScreen( - int ii, ScreenPtr pScreen ){ @@ -319,13 +318,13 @@ XvCloseScreen( pScreen->DestroyWindow = pxvs->DestroyWindow; pScreen->CloseScreen = pxvs->CloseScreen; - (* pxvs->ddCloseScreen)(ii, pScreen); + (* pxvs->ddCloseScreen)(pScreen); free(pxvs); pScreen->devPrivates[XvScreenIndex].ptr = (void *)NULL; - return (*pScreen->CloseScreen)(ii, pScreen); + return (*pScreen->CloseScreen)(pScreen); } diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c index 0a43baa22..fcd170efd 100644 --- a/nx-X11/programs/Xserver/Xext/xvmc.c +++ b/nx-X11/programs/Xserver/Xext/xvmc.c @@ -696,7 +696,7 @@ XvMCExtensionInit() } static Bool -XvMCCloseScreen (int i, ScreenPtr pScreen) +XvMCCloseScreen (ScreenPtr pScreen) { XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pScreen); @@ -704,7 +704,7 @@ XvMCCloseScreen (int i, ScreenPtr pScreen) free(pScreenPriv); - return (*pScreen->CloseScreen)(i, pScreen); + return (*pScreen->CloseScreen)(pScreen); } -- cgit v1.2.3