From b0b62dde6decc460feb4037b630ce0de6d1fb19b Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 18 Oct 2017 00:08:24 +0200 Subject: keysym.h: fix include path --- nx-X11/include/keysym.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 +#include -- cgit v1.2.3 From fff0d54733b016f225eb767b3d755c06295ac806 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 18 Oct 2017 00:21:00 +0200 Subject: glxext.c/NXglxext.c: merge two functions into one This has also been done in Xorg 7.1 This also fixes a little flaw for the swapped case: a check for glXRenderLarge was missing. --- nx-X11/programs/Xserver/GL/glx/glxext.c | 54 ++----------------- nx-X11/programs/Xserver/hw/nxagent/NXglxext.c | 75 ++------------------------- 2 files changed, 9 insertions(+), 120 deletions(-) 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/hw/nxagent/NXglxext.c b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c index 5512cae1b..f94473be0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c @@ -107,77 +107,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 -- cgit v1.2.3 From ac66ba34990568b03526574f7e0d320f6b5f780a Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 18 Oct 2017 00:22:53 +0200 Subject: NXglxext.c: rename and relocate variable This change make the code more similar to upstream Xorg which helps when merging in changes from later Xorg releases. --- nx-X11/programs/Xserver/hw/nxagent/NXglxext.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c index f94473be0..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]; @@ -124,7 +123,7 @@ static int __glXDispatch(ClientPtr client) opcode, client -> index); #endif - result = (*proc)(cl, (GLbyte *) stuff); + retval = (*proc)(cl, (GLbyte *) stuff); nxagentGlxTrap = 0; @@ -133,5 +132,5 @@ static int __glXDispatch(ClientPtr client) opcode, client -> index); #endif - return result; + return retval; } -- cgit v1.2.3 From 9a16043722f6d60505a8776048b39cc7f1e799d9 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 18 Oct 2017 00:28:23 +0200 Subject: fix broken path due to missing / --- .../Xserver/GL/mesa/shader/slang/Imakefile.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 \ -- cgit v1.2.3