diff options
| author | Dave Airlie <airlied@gmail.com> | 2017-03-11 00:53:01 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-10 14:56:29 +0200 |
| commit | 93ea74e53e13890ea2f85ea57e9455d0eb2525f4 (patch) | |
| tree | 9df00122916a65b8c53ee37129628efd916029f9 /nx-X11/programs/Xserver/miext | |
| parent | ab3974f22b213a64316bf4384c3fd6d92c005f58 (diff) | |
| download | nx-libs-93ea74e53e13890ea2f85ea57e9455d0eb2525f4.tar.gz nx-libs-93ea74e53e13890ea2f85ea57e9455d0eb2525f4.tar.bz2 nx-libs-93ea74e53e13890ea2f85ea57e9455d0eb2525f4.zip | |
xserver: remove index from CloseScreen (API/ABI breakage)
Extracted from X.org bulk commit:
commit 1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5
Author: Dave Airlie <airlied@redhat.com>
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 <airlied@gmail.com>
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 <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'nx-X11/programs/Xserver/miext')
| -rw-r--r-- | nx-X11/programs/Xserver/miext/cw/cw.c | 6 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/miext/damage/damage.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/miext/cw/cw.c b/nx-X11/programs/Xserver/miext/cw/cw.c index 774f0d056..d9ca55f7e 100644 --- a/nx-X11/programs/Xserver/miext/cw/cw.c +++ b/nx-X11/programs/Xserver/miext/cw/cw.c @@ -55,7 +55,7 @@ static unsigned long cwGeneration = 0; extern GCOps cwGCOps; static Bool -cwCloseScreen (int i, ScreenPtr pScreen); +cwCloseScreen (ScreenPtr pScreen); static void cwValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable); @@ -673,7 +673,7 @@ miDisableCompositeWrapper(ScreenPtr pScreen) } static Bool -cwCloseScreen (int i, ScreenPtr pScreen) +cwCloseScreen (ScreenPtr pScreen) { cwScreenPtr pScreenPriv; #ifdef RENDER @@ -697,5 +697,5 @@ cwCloseScreen (int i, ScreenPtr pScreen) free((void *)pScreenPriv); - return (*pScreen->CloseScreen)(i, pScreen); + return (*pScreen->CloseScreen)(pScreen); } diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c index ca8128975..348adcb65 100644 --- a/nx-X11/programs/Xserver/miext/damage/damage.c +++ b/nx-X11/programs/Xserver/miext/damage/damage.c @@ -1717,7 +1717,7 @@ damageDestroyWindow (WindowPtr pWindow) } static Bool -damageCloseScreen (int i, ScreenPtr pScreen) +damageCloseScreen (ScreenPtr pScreen) { damageScrPriv(pScreen); @@ -1729,7 +1729,7 @@ damageCloseScreen (int i, ScreenPtr pScreen) unwrap (pScrPriv, pScreen, CloseScreen); unwrap (pScrPriv, pScreen, BackingStoreFuncs.RestoreAreas); free (pScrPriv); - return (*pScreen->CloseScreen) (i, pScreen); + return (*pScreen->CloseScreen) (pScreen); } int damageScrPrivateIndex; |