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/hw | |
| 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/hw')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 8 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 01d8c1fc7..8fb4ce710 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -820,7 +820,7 @@ static int nxagentColorOffset(unsigned long mask) return count; } -Bool nxagentOpenScreen(int index, ScreenPtr pScreen, +Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[]) { VisualPtr visuals; @@ -846,7 +846,7 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, #ifdef TEST fprintf(stderr, "nxagentOpenScreen: Called for screen index [%d].\n", - index); + pScreen->myNum); #endif if (nxagentRenderEnable && nxagentReconnectTrap == False) @@ -2075,7 +2075,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio return True; } -Bool nxagentCloseScreen(int index, ScreenPtr pScreen) +Bool nxagentCloseScreen(ScreenPtr pScreen) { int i; @@ -3552,7 +3552,7 @@ Bool nxagentReconnectScreen(void *p0) fprintf(stderr, "nxagentReconnectScreen\n"); #endif - if (!nxagentOpenScreen(0, nxagentDefaultScreen, nxagentArgc, nxagentArgv)) + if (!nxagentOpenScreen(nxagentDefaultScreen, nxagentArgc, nxagentArgv)) { return False; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/nx-X11/programs/Xserver/hw/nxagent/Screen.h index caefbb027..3df586fa8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h @@ -88,10 +88,10 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin); #endif /* #ifdef VIEWPORT_FRAME */ -Bool nxagentOpenScreen(int index, ScreenPtr pScreen, +Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[]); -Bool nxagentCloseScreen(int index, ScreenPtr pScreen); +Bool nxagentCloseScreen(ScreenPtr pScreen); #define nxagentScreen(window) nxagentDefaultScreen |