Merge branch 'uli42-small_fixes' into 3.6.x

Attributes GH PR #532: https://github.com/ArcticaProject/nx-libs/pull/532

4 files changed, 23 insertions, 135 deletions

diff --git a/nx-X11/include/keysym.h b/nx-X11/include/keysym.h
index 4f584886c..0d2493d4c 100644
--- a/nx-X11/include/keysym.h
+++ b/nx-X11/include/keysym.h
@@ -70,5 +70,5 @@ SOFTWARE.
 #define XK_BRAILLE
 #define XK_SINHALA
 
-#include <X11/keysymdef.h>
+#include <nx-X11/keysymdef.h>
 
diff --git a/nx-X11/programs/Xserver/GL/glx/glxext.c b/nx-X11/programs/Xserver/GL/glx/glxext.c
index cb82dc609..e92e605fa 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxext.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxext.c
@@ -42,7 +42,6 @@ static __GLXextensionInfo *__glXExt /* = &__glDDXExtensionInfo */;
 /*
 ** Forward declarations.
 */
-static int __glXSwapDispatch(ClientPtr);
 static int __glXDispatch(ClientPtr);
 
 /*
@@ -246,7 +245,7 @@ void GlxExtensionInit(void)
     */
     extEntry = AddExtension(GLX_EXTENSION_NAME, __GLX_NUMBER_EVENTS,
 			    __GLX_NUMBER_ERRORS, __glXDispatch,
-			    __glXSwapDispatch, ResetExtension,
+			    __glXDispatch, ResetExtension,
 			    StandardMinorOpcode);
     if (!extEntry) {
 	FatalError("__glXExtensionInit: AddExtensions failed\n");
@@ -445,53 +444,10 @@ static int __glXDispatch(ClientPtr client)
     /*
     ** Use the opcode to index into the procedure table.
     */
-    proc = __glXSingleTable[opcode];
-    return (*proc)(cl, (GLbyte *) stuff);
-}
-
-static int __glXSwapDispatch(ClientPtr client)
-{
-    REQUEST(xGLXSingleReq);
-    CARD8 opcode;
-    int (*proc)(__GLXclientState *cl, GLbyte *pc);
-    __GLXclientState *cl;
-
-    opcode = stuff->glxCode;
-    cl = __glXClients[client->index];
-    if (!cl) {
-	cl = (__GLXclientState *) malloc(sizeof(__GLXclientState));
-	 __glXClients[client->index] = cl;
-	if (!cl) {
-	    return BadAlloc;
-	}
-	memset(cl, 0, sizeof(__GLXclientState));
-    }
-    
-    if (!cl->inUse) {
-	/*
-	** This is first request from this client.  Associate a resource
-	** with the client so we will be notified when the client dies.
-	*/
-	XID xid = FakeClientID(client->index);
-	if (!AddResource( xid, __glXClientRes, (void *)(long)client->index)) {
-	    return BadAlloc;
-	}
-	ResetClientState(client->index);
-	cl->inUse = GL_TRUE;
-	cl->client = client;
-    }
-
-    /*
-    ** Check for valid opcode.
-    */
-    if (opcode >= __GLX_SINGLE_TABLE_SIZE) {
-	return BadRequest;
-    }
-
-    /*
-    ** Use the opcode to index into the procedure table.
-    */
-    proc = __glXSwapSingleTable[opcode];
+    if (client->swapped)
+	proc = __glXSwapSingleTable[opcode];
+    else
+	proc = __glXSingleTable[opcode];
     return (*proc)(cl, (GLbyte *) stuff);
 }
 
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc
index 4ffa7805f..6757e2e50 100644
--- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc
@@ -61,16 +61,16 @@ LinkSourceFile(traverse_wrap.h, $(MESASRCDIR)/src/mesa/shader/slang)
  MESA_SLANG_UOBJS = $(MESA_SLANG_OBJS)
 #endif
 
- MESA_SLANG_DOBJS = $(MESASLANGBUILDDIR)debuggerslang_assemble_assignment.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_assemble.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_assemble_conditional.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_assemble_constructor.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_assemble_typeinfo.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_compile.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_execute.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_preprocess.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_storage.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_utility.o
+ MESA_SLANG_DOBJS = $(MESASLANGBUILDDIR)debugger/slang_assemble_assignment.o \
+                    $(MESASLANGBUILDDIR)debugger/slang_assemble.o \
+                    $(MESASLANGBUILDDIR)debugger/slang_assemble_conditional.o \
+                    $(MESASLANGBUILDDIR)debugger/slang_assemble_constructor.o \
+                    $(MESASLANGBUILDDIR)debugger/slang_assemble_typeinfo.o \
+                    $(MESASLANGBUILDDIR)debugger/slang_compile.o \
+                    $(MESASLANGBUILDDIR)debugger/slang_execute.o \
+                    $(MESASLANGBUILDDIR)debugger/slang_preprocess.o \
+                    $(MESASLANGBUILDDIR)debugger/slang_storage.o \
+                    $(MESASLANGBUILDDIR)debugger/slang_utility.o
 
  MESA_SLANG_POBJS = $(MESASLANGBUILDDIR)profiled/slang_assemble_assignment.o \
                     $(MESASLANGBUILDDIR)profiled/slang_assemble.o \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
index 5512cae1b..9d0f4f719 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
@@ -57,12 +57,11 @@
 */
 static int __glXDispatch(ClientPtr client)
 {
-    int result;
-
     REQUEST(xGLXSingleReq);
     CARD8 opcode;
     int (*proc)(__GLXclientState *cl, GLbyte *pc);
     __GLXclientState *cl;
+    int retval;
 
     opcode = stuff->glxCode;
     cl = __glXClients[client->index];
@@ -107,77 +106,10 @@ static int __glXDispatch(ClientPtr client)
     /*
     ** Use the opcode to index into the procedure table.
     */
-    proc = __glXSingleTable[opcode];
-
-    /*
-     * 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);
-    __GLXclientState *cl;
-
-    opcode = stuff->glxCode;
-    cl = __glXClients[client->index];
-    if (!cl) {
-	cl = (__GLXclientState *) malloc(sizeof(__GLXclientState));
-	 __glXClients[client->index] = cl;
-	if (!cl) {
-	    return BadAlloc;
-	}
-	memset(cl, 0, sizeof(__GLXclientState));
-    }
-    
-    if (!cl->inUse) {
-	/*
-	** This is first request from this client.  Associate a resource
-	** with the client so we will be notified when the client dies.
-	*/
-	XID xid = FakeClientID(client->index);
-	if (!AddResource( xid, __glXClientRes, (void *)(long)client->index)) {
-	    return BadAlloc;
-	}
-	ResetClientState(client->index);
-	cl->inUse = GL_TRUE;
-	cl->client = client;
-    }
-
-    /*
-    ** Check for valid opcode.
-    */
-    if (opcode >= __GLX_SINGLE_TABLE_SIZE) {
-	return BadRequest;
-    }
-
-    /*
-    ** Use the opcode to index into the procedure table.
-    */
-    proc = __glXSwapSingleTable[opcode];
+    if (client->swapped)
+        proc = __glXSwapSingleTable[opcode];
+    else
+        proc = __glXSingleTable[opcode];
 
     /*
      * Report upstream that we are
@@ -191,7 +123,7 @@ static int __glXSwapDispatch(ClientPtr client)
                 opcode, client -> index);
     #endif
     
-    result = (*proc)(cl, (GLbyte *) stuff);
+    retval = (*proc)(cl, (GLbyte *) stuff);
 
     nxagentGlxTrap = 0;
 
@@ -200,5 +132,5 @@ static int __glXSwapDispatch(ClientPtr client)
                 opcode, client -> index);
     #endif
 
-    return result;
+    return retval;
 }