aboutsummaryrefslogtreecommitdiff
path: root/doc/nx-X11_vs_XOrg69_patches/NXglxext.c.NX.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-13 14:14:26 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-13 14:18:50 +0100
commit1e5ee575d4912665dd2356681f0827d5229fa1f5 (patch)
tree31db7768b2686507a5f9ea2ffa03d9c62ccf78c9 /doc/nx-X11_vs_XOrg69_patches/NXglxext.c.NX.patch
parent1fd8551f1632efbc2655c9293087bba08cf2f0c9 (diff)
downloadnx-libs-1e5ee575d4912665dd2356681f0827d5229fa1f5.tar.gz
nx-libs-1e5ee575d4912665dd2356681f0827d5229fa1f5.tar.bz2
nx-libs-1e5ee575d4912665dd2356681f0827d5229fa1f5.zip
nx-X11 vs. X.Org 6.9 patches for further studying / documentation
NoMachine kept all original X.Org 6.9 files in the nx-X11 source tree. These files have been removed in Feb 2015 during a major code cleanup. For later studying we provide all diffs of the changes that NoMachine employed on the original X.Org X11 code tree in the doc/nx-X11_vs_XOrg69_patches folder.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/NXglxext.c.NX.patch')
-rw-r--r--doc/nx-X11_vs_XOrg69_patches/NXglxext.c.NX.patch118
1 files changed, 118 insertions, 0 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/NXglxext.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/NXglxext.c.NX.patch
new file mode 100644
index 000000000..a8dbfe0fd
--- /dev/null
+++ b/doc/nx-X11_vs_XOrg69_patches/NXglxext.c.NX.patch
@@ -0,0 +1,118 @@
+--- ./nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c.X.original 2015-02-13 14:03:44.744441510 +0100
++++ ./nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c 2015-02-10 19:13:13.808685737 +0100
+@@ -1,3 +1,20 @@
++/**************************************************************************/
++/* */
++/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */
++/* */
++/* NXAGENT, NX protocol compression and NX extensions to this software */
++/* are copyright of NoMachine. Redistribution and use of the present */
++/* software is allowed according to terms specified in the file LICENSE */
++/* which comes in the source distribution. */
++/* */
++/* Check http://www.nomachine.com/licensing.html for applicability. */
++/* */
++/* NX and NoMachine are trademarks of Medialogic S.p.A. */
++/* */
++/* All rights reserved. */
++/* */
++/**************************************************************************/
++
+ /* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.9 2003/09/28 20:15:43 alanh Exp $
+ ** The contents of this file are subject to the GLX Public License Version 1.0
+ ** (the "License"). You may not use this file except in compliance with the
+@@ -33,6 +50,12 @@
+ #include "glxext.h"
+ #include "micmap.h"
+
++#include "Trap.h"
++
++#define PANIC
++#define WARNING
++#undef TEST
++#undef DEBUG
+
+ void GlxWrapInitVisuals(miInitVisualsProcPtr *);
+ void GlxSetVisualConfigs(int nconfigs,
+@@ -395,6 +418,8 @@
+ */
+ static int __glXDispatch(ClientPtr client)
+ {
++ int result;
++
+ REQUEST(xGLXSingleReq);
+ CARD8 opcode;
+ int (*proc)(__GLXclientState *cl, GLbyte *pc);
+@@ -444,11 +469,35 @@
+ ** Use the opcode to index into the procedure table.
+ */
+ proc = __glXSingleTable[opcode];
+- return (*proc)(cl, (GLbyte *) stuff);
++
++ /*
++ * Report upstream that we are
++ * dispatching a GLX operation.
++ */
++
++ nxagentGlxTrap = 1;
++
++ #ifdef TEST
++ fprintf(stderr, "__glXDispatch: Going to dispatch GLX operation [%d] for client [%d].\n",
++ opcode, client -> index);
++ #endif
++
++ result = (*proc)(cl, (GLbyte *) stuff);
++
++ nxagentGlxTrap = 0;
++
++ #ifdef TEST
++ fprintf(stderr, "__glXDispatch: Dispatched GLX operation [%d] for client [%d].\n",
++ opcode, client -> index);
++ #endif
++
++ return result;
+ }
+
+ static int __glXSwapDispatch(ClientPtr client)
+ {
++ int result;
++
+ REQUEST(xGLXSingleReq);
+ CARD8 opcode;
+ int (*proc)(__GLXclientState *cl, GLbyte *pc);
+@@ -490,7 +539,29 @@
+ ** Use the opcode to index into the procedure table.
+ */
+ proc = __glXSwapSingleTable[opcode];
+- return (*proc)(cl, (GLbyte *) stuff);
++
++ /*
++ * Report upstream that we are
++ * dispatching a GLX operation.
++ */
++
++ nxagentGlxTrap = 1;
++
++ #ifdef TEST
++ fprintf(stderr, "__glXDispatch: Going to dispatch GLX operation [%d] for client [%d].\n",
++ opcode, client -> index);
++ #endif
++
++ result = (*proc)(cl, (GLbyte *) stuff);
++
++ nxagentGlxTrap = 0;
++
++ #ifdef TEST
++ fprintf(stderr, "__glXDispatch: Dispatched GLX operation [%d] for client [%d].\n",
++ opcode, client -> index);
++ #endif
++
++ return result;
+ }
+
+ int __glXNoSuchSingleOpcode(__GLXclientState *cl, GLbyte *pc)
+@@ -502,4 +573,3 @@
+ {
+ return;
+ }
+-