From c529873d9e7265634fd5223e727f58eb2d0c1a27 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 Nov 2017 22:00:44 +0100 Subject: Lift dbe to xorg-xserver-7.1/1.1.0 state --- nx-X11/programs/Xserver/dbe/midbe.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/dbe/midbe.c') diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index e241e5f28..b0054201c 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -53,6 +53,7 @@ #include "regionstr.h" #include "gcstruct.h" #include "inputstr.h" +#include "midbe.h" #include @@ -780,6 +781,11 @@ miDbeResetProc(pScreen) } /* miDbeResetProc() */ +static void +miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer) +{ +} + /****************************************************************************** * @@ -840,7 +846,7 @@ miDbeInit(pScreen, pDbeScreenPriv) pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete; /* The mi implementation doesn't need buffer validation. */ - pDbeScreenPriv->ValidateBuffer = (void (*)())NoopDDA; + pDbeScreenPriv->ValidateBuffer = miDbeNopValidateBuffer; return(TRUE); -- cgit v1.2.3 From 4c5e9a295230362ef072132cdc0f5b92150fc2b9 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Feb 2018 06:11:56 +0100 Subject: Lift dbe to xorg-xserver-7.1/1.1.0 state - non-functional changes only --- nx-X11/programs/Xserver/dbe/midbe.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) (limited to 'nx-X11/programs/Xserver/dbe/midbe.c') diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index b0054201c..0c987314e 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -91,9 +91,7 @@ int dbeWindowPrivIndex = -1; *****************************************************************************/ static Bool -miDbeGetVisualInfo(pScreen, pScrVisInfo) - ScreenPtr pScreen; - XdbeScreenVisualInfo *pScrVisInfo; +miDbeGetVisualInfo(ScreenPtr pScreen, XdbeScreenVisualInfo *pScrVisInfo) { register int i, j, k; register int count; @@ -155,10 +153,7 @@ miDbeGetVisualInfo(pScreen, pScrVisInfo) *****************************************************************************/ static int -miDbeAllocBackBufferName(pWin, bufId, swapAction) - WindowPtr pWin; - XID bufId; - int swapAction; +miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction) { ScreenPtr pScreen; DbeWindowPrivPtr pDbeWindowPriv; @@ -269,8 +264,7 @@ miDbeAllocBackBufferName(pWin, bufId, swapAction) *****************************************************************************/ static void -miDbeAliasBuffers(pDbeWindowPriv) - DbeWindowPrivPtr pDbeWindowPriv; +miDbeAliasBuffers(DbeWindowPrivPtr pDbeWindowPriv) { int i; MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv = @@ -296,10 +290,7 @@ miDbeAliasBuffers(pDbeWindowPriv) *****************************************************************************/ static int -miDbeSwapBuffers(client, pNumWindows, swapInfo) - ClientPtr client; - int *pNumWindows; - DbeSwapInfoPtr swapInfo; +miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo) { DbeScreenPrivPtr pDbeScreenPriv; GCPtr pGC; @@ -478,9 +469,7 @@ miDbeSwapBuffers(client, pNumWindows, swapInfo) *****************************************************************************/ static void -miDbeWinPrivDelete(pDbeWindowPriv, bufId) - DbeWindowPrivPtr pDbeWindowPriv; - XID bufId; +miDbeWinPrivDelete(DbeWindowPrivPtr pDbeWindowPriv, XID bufId) { MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv; @@ -527,10 +516,7 @@ miDbeWinPrivDelete(pDbeWindowPriv, bufId) *****************************************************************************/ static Bool -miDbePositionWindow(pWin, x, y) - WindowPtr pWin; - int x; - int y; +miDbePositionWindow(WindowPtr pWin, int x, int y) { ScreenPtr pScreen; DbeScreenPrivPtr pDbeScreenPriv; @@ -768,8 +754,7 @@ miDbePositionWindow(pWin, x, y) *****************************************************************************/ static void -miDbeResetProc(pScreen) - ScreenPtr pScreen; +miDbeResetProc(ScreenPtr pScreen) { DbeScreenPrivPtr pDbeScreenPriv; @@ -798,9 +783,7 @@ miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer) *****************************************************************************/ Bool -miDbeInit(pScreen, pDbeScreenPriv) - ScreenPtr pScreen; - DbeScreenPrivPtr pDbeScreenPriv; +miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv) { /* Copy resource types created by DIX */ dbeDrawableResType = pDbeScreenPriv->dbeDrawableResType; -- cgit v1.2.3 From 95b5cf7954d8513cd0b33f032581df81416d2175 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 22 Jan 2018 22:26:59 +0100 Subject: Lift dbe to xorg-xserver-1.4.2 state --- nx-X11/programs/Xserver/dbe/midbe.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'nx-X11/programs/Xserver/dbe/midbe.c') diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index 0c987314e..9629456df 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -67,11 +67,10 @@ static int miDbePrivPrivGeneration = 0; static int miDbeWindowPrivPrivIndex = -1; -RESTYPE dbeDrawableResType; -RESTYPE dbeWindowPrivResType; -int dbeScreenPrivIndex = -1; -int dbeWindowPrivIndex = -1; - +static RESTYPE dbeDrawableResType; +static RESTYPE dbeWindowPrivResType; +static int dbeScreenPrivIndex = -1; +static int dbeWindowPrivIndex = -1; /****************************************************************************** @@ -766,11 +765,6 @@ miDbeResetProc(ScreenPtr pScreen) } /* miDbeResetProc() */ -static void -miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer) -{ -} - /****************************************************************************** * @@ -828,9 +822,6 @@ miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv) pDbeScreenPriv->ResetProc = miDbeResetProc; pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete; - /* The mi implementation doesn't need buffer validation. */ - pDbeScreenPriv->ValidateBuffer = miDbeNopValidateBuffer; - return(TRUE); } /* miDbeInit() */ -- cgit v1.2.3 From d364ea933659c779124d7f3b6833f21968599de6 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Feb 2018 06:15:49 +0100 Subject: Lift dbe to xorg-xserver-1.4.2 state - non-functional changes only --- nx-X11/programs/Xserver/dbe/midbe.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'nx-X11/programs/Xserver/dbe/midbe.c') diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index 9629456df..0cc838d80 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -57,14 +57,6 @@ #include -/* DEFINES */ - - -/* TYPEDEFS */ - - -/* GLOBALS */ - static int miDbePrivPrivGeneration = 0; static int miDbeWindowPrivPrivIndex = -1; static RESTYPE dbeDrawableResType; -- cgit v1.2.3