This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit 95b5cf7954d8513cd0b33f032581df81416d2175
Author: Ulrich Sibiller <ul...@gmx.de>
Date: Mon Jan 22 22:26:59 2018 +0100
Lift dbe to xorg-xserver-1.4.2 state
---
nx-X11/programs/Xserver/dbe/dbe.c | 31 -------------------------------
nx-X11/programs/Xserver/dbe/dbestruct.h | 6 ------
nx-X11/programs/Xserver/dbe/midbe.c | 17 ++++-------------
3 files changed, 4 insertions(+), 50 deletions(-)
diff --git a/nx-X11/programs/Xserver/dbe/dbe.c
b/nx-X11/programs/Xserver/dbe/dbe.c
index 89df088..702af85 100644
--- a/nx-X11/programs/Xserver/dbe/dbe.c
+++ b/nx-X11/programs/Xserver/dbe/dbe.c
@@ -80,36 +80,6 @@ static Bool firstRegistrationPass = TRUE;
/******************************************************************************
*
- * DBE DIX Procedure: DbeValidateBuffer
- *
- * Description:
- *
- * This function is called from VALIDATE_DRAWABLE_AND_GC and from
- * various places in dispatch.c if the server has been compiled with
- * the flags -DNEED_DBE_BUF_BITS and -DNEED_DBE_BUF_VALIDATE.
- * When pWin->dstBuffer changes, this function will be called with pWin
- * as the first argument, the drawable ID that was specified as the
- * second argument (could be a back buffer id), and True for the third
- * argument.
- * When pWin->srcBuffer changes, the third argument will be False, and
- * the first two arguments are as described for dstBuffer.
- *
- * This function should prepare the hardware to access the specified
- * buffer for reads (if dstbuf is False) or writes (if dstbuf is True).
- *
- *****************************************************************************/
-
-void
-DbeValidateBuffer(WindowPtr pWin, XID drawID, Bool dstbuf)
-{
- DbeScreenPrivPtr pDbeScreenPriv = DBE_SCREEN_PRIV_FROM_WINDOW(pWin);
- if (pDbeScreenPriv->ValidateBuffer)
- (*pDbeScreenPriv->ValidateBuffer)(pWin, drawID, dstbuf);
-}
-
-
-/******************************************************************************
- *
* DBE DIX Procedure: DbeRegisterFunction
*
* Description:
@@ -315,7 +285,6 @@ DbeStubScreen(DbeScreenPrivPtr pDbeScreenPriv, int
*nStubbedScreens)
pDbeScreenPriv->EndIdiom = NULL;
pDbeScreenPriv->WinPrivDelete = NULL;
pDbeScreenPriv->ResetProc = NULL;
- pDbeScreenPriv->ValidateBuffer = NULL;
(*nStubbedScreens)++;
diff --git a/nx-X11/programs/Xserver/dbe/dbestruct.h
b/nx-X11/programs/Xserver/dbe/dbestruct.h
index 17690d5..3e5945b 100644
--- a/nx-X11/programs/Xserver/dbe/dbestruct.h
+++ b/nx-X11/programs/Xserver/dbe/dbestruct.h
@@ -36,7 +36,6 @@
/* INCLUDES */
-#define NEED_DBE_PROTOCOL
#include <nx-X11/extensions/Xdbeproto.h>
#include "windowstr.h"
@@ -220,11 +219,6 @@ typedef struct _DbeScreenPrivRec
void (*ResetProc)(
ScreenPtr /*pScreen*/
);
- void (*ValidateBuffer)(
- WindowPtr /*pWin*/,
- XID /*bufId*/,
- Bool /*dstbuffer*/
-);
/* Device-specific private information.
*/
diff --git a/nx-X11/programs/Xserver/dbe/midbe.c
b/nx-X11/programs/Xserver/dbe/midbe.c
index 0c98731..9629456 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() */
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/nx-libs.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
