From abd6cf1bdd661f126af2a721cb3f467f3a6db9f7 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 26 Feb 2016 08:14:28 +0100
Subject: rename original NX patches, so that we can see the patched file's
 name in the patch file name.

---
 doc/nx-X11_vs_XOrg69_patches/context.c.NX.patch | 103 ------------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 doc/nx-X11_vs_XOrg69_patches/context.c.NX.patch

(limited to 'doc/nx-X11_vs_XOrg69_patches/context.c.NX.patch')

diff --git a/doc/nx-X11_vs_XOrg69_patches/context.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/context.c.NX.patch
deleted file mode 100644
index 92dedfc0a..000000000
--- a/doc/nx-X11_vs_XOrg69_patches/context.c.NX.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- ./nx-X11/extras/Mesa/src/mesa/main/context.c.X.original	2015-02-13 14:03:44.464447019 +0100
-+++ ./nx-X11/extras/Mesa/src/mesa/main/context.c	2015-02-10 19:13:14.800648672 +0100
-@@ -131,6 +131,10 @@
- #endif
- #include "shaderobjects.h"
- 
-+#ifdef NXAGENT_SERVER
-+#include "WSDrawBuffer.h"
-+#endif
-+
- #ifdef USE_SPARC_ASM
- #include "sparc/sparc.h"
- #endif
-@@ -143,6 +147,47 @@
- int MESA_DEBUG_FLAGS = 0;
- #endif
- 
-+#ifdef NXAGENT_SERVER
-+extern WSDrawBufferPtr pWSDrawBuffer;
-+
-+int IsWSDrawBuffer(GLframebuffer *mesa_buffer)
-+{
-+  WSDrawBufferPtr p = pWSDrawBuffer;
-+
-+  while (p != NULL) {
-+    if (p -> DrawBuffer == mesa_buffer) {
-+      return 1;
-+    }
-+    p = p -> next;
-+  }
-+  return 0;
-+}
-+
-+void FreeWSDrawBuffer(GLframebuffer *mesa_buffer)
-+{
-+  WSDrawBufferPtr p = pWSDrawBuffer;
-+  WSDrawBufferPtr pOld = NULL;
-+
-+  if (p == NULL)
-+    return;
-+
-+  if (p -> DrawBuffer == mesa_buffer) {
-+    pWSDrawBuffer = p -> next;
-+    free(p);
-+    return;
-+  }
-+
-+  while (p -> next != NULL) {
-+    if (p -> next -> DrawBuffer == mesa_buffer) {
-+      pOld = p -> next;
-+      p -> next = p -> next -> next;
-+      free(pOld);
-+      return;
-+    }
-+    p = p -> next;
-+  }
-+}
-+#endif
- 
- /* ubyte -> float conversion */
- GLfloat _mesa_ubyte_to_float_color_tab[256];
-@@ -1520,6 +1565,10 @@
- _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
-                     GLframebuffer *readBuffer )
- {
-+   #ifdef NXAGENT_SERVER
-+   int flag;
-+   #endif
-+
-    if (MESA_VERBOSE & VERBOSE_API)
-       _mesa_debug(newCtx, "_mesa_make_current()\n");
- 
-@@ -1558,11 +1607,30 @@
-          ASSERT(readBuffer->Name == 0);
-          newCtx->WinSysDrawBuffer = drawBuffer;
-          newCtx->WinSysReadBuffer = readBuffer;
-+
-+#ifdef NXAGENT_SERVER
-+         flag = 0;
-+         if (newCtx->DrawBuffer) {
-+           if (!IsWSDrawBuffer(newCtx->DrawBuffer)) {
-+             if (newCtx->DrawBuffer->Name == 0) {
-+               flag = 1;
-+             }
-+             FreeWSDrawBuffer(newCtx->DrawBuffer);
-+           }
-+           else flag = 1;
-+         }
-+
-+         if (!newCtx->DrawBuffer || flag) {
-+           newCtx->DrawBuffer = drawBuffer;
-+           newCtx->ReadBuffer = readBuffer;
-+         }
-+#else
-          /* don't replace user-buffer bindings with window system buffer */
-          if (!newCtx->DrawBuffer || newCtx->DrawBuffer->Name == 0) {
-             newCtx->DrawBuffer = drawBuffer;
-             newCtx->ReadBuffer = readBuffer;
-          }
-+#endif
- 
- 	 newCtx->NewState |= _NEW_BUFFERS;
- 
-- 
cgit v1.2.3