From d14cc5361f7db7016b7cbb1cc59d8500101d9f27 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 10:16:00 +0200 Subject: doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here. --- ...programs_Xserver_GL_mesa_X_xf86glx.c.X.original | 70 ---------------------- 1 file changed, 70 deletions(-) delete mode 100644 doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_GL_mesa_X_xf86glx.c.X.original (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_GL_mesa_X_xf86glx.c.X.original') diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_GL_mesa_X_xf86glx.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_GL_mesa_X_xf86glx.c.X.original deleted file mode 100644 index eaa3a1624..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_programs_Xserver_GL_mesa_X_xf86glx.c.X.original +++ /dev/null @@ -1,70 +0,0 @@ ---- ./nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c.X.original 2015-02-13 14:03:44.680442769 +0100 -+++ ./nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c 2015-02-10 19:13:14.340665851 +0100 -@@ -71,6 +71,10 @@ - - #include "glcontextmodes.h" - -+#ifdef NXAGENT_SERVER -+#include "../main/WSDrawBuffer.h" -+#endif -+ - /* - * This structure is statically allocated in the __glXScreens[] - * structure. This struct is not used anywhere other than in -@@ -95,6 +99,36 @@ - NULL /* WrappedPositionWindow is overwritten */ - }; - -+#ifdef NXAGENT_SERVER -+WSDrawBufferPtr pWSDrawBuffer = NULL; -+ -+void AddWSDrawBuffer(GLframebuffer *mesa_buffer) -+{ -+ WSDrawBufferPtr prevWSDB; -+ WSDrawBufferPtr newWSDB; -+ WSDrawBufferPtr p; -+ -+ prevWSDB = NULL; -+ newWSDB = NULL; -+ p = pWSDrawBuffer; -+ while (p != NULL) { -+ prevWSDB = p; -+ if (prevWSDB -> DrawBuffer == mesa_buffer) { -+ return; -+ } -+ p = p -> next; -+ } -+ newWSDB = malloc(sizeof(WSDrawBufferRec)); -+ newWSDB -> DrawBuffer = mesa_buffer; -+ newWSDB -> next = NULL; -+ -+ if (pWSDrawBuffer == NULL) -+ pWSDrawBuffer = newWSDB; -+ else -+ prevWSDB -> next = newWSDB; -+} -+#endif -+ - void *__glXglDDXScreenInfo(void) { - return &__glDDXScreenInfo; - } -@@ -748,6 +782,10 @@ - __MESA_buffer buf = (__MESA_buffer)glPriv->private; - __GLXdrawablePrivate *glxPriv = (__GLXdrawablePrivate *)glPriv->other; - -+#ifdef NXAGENT_SERVER -+ AddWSDrawBuffer(& (buf -> xm_buf -> mesa_buffer) ); -+#endif -+ - /* Destroy Mesa's buffers */ - if (buf->xm_buf) - XMesaDestroyBuffer(buf->xm_buf); -@@ -757,7 +795,7 @@ - glPriv->frontBuffer.resize = buf->fbresize; - - __glXFree(glPriv->private); -- glPriv->private = NULL; -+ glPriv->private = NULL; - } - - __GLinterface *__MESA_createContext(__GLimports *imports, -- cgit v1.2.3