Skip to content

N
nx-libs
Unverified Commit 39d45a0e authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'uli42-small_fixes' into 3.6.x

Attributes GH PR #532: https://github.com/ArcticaProject/nx-libs/pull/532
parents 56569f33 9a160437
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 135 deletions
nx-X11/include/keysym.h
View file @ 39d45a0e
...@@ -70,5 +70,5 @@ SOFTWARE. ...@@ -70,5 +70,5 @@ SOFTWARE.
#define XK_BRAILLE #define XK_BRAILLE
#define XK_SINHALA #define XK_SINHALA
#include <X11/keysymdef.h> #include <nx-X11/keysymdef.h>
nx-X11/programs/Xserver/GL/glx/glxext.c
View file @ 39d45a0e
...@@ -42,7 +42,6 @@ static __GLXextensionInfo *__glXExt /* = &__glDDXExtensionInfo */; ...@@ -42,7 +42,6 @@ static __GLXextensionInfo *__glXExt /* = &__glDDXExtensionInfo */;
/* /*
** Forward declarations. ** Forward declarations.
*/ */
static int __glXSwapDispatch(ClientPtr);
static int __glXDispatch(ClientPtr); static int __glXDispatch(ClientPtr);
/* /*
...@@ -246,7 +245,7 @@ void GlxExtensionInit(void) ...@@ -246,7 +245,7 @@ void GlxExtensionInit(void)
*/ */
extEntry = AddExtension(GLX_EXTENSION_NAME, __GLX_NUMBER_EVENTS, extEntry = AddExtension(GLX_EXTENSION_NAME, __GLX_NUMBER_EVENTS,
__GLX_NUMBER_ERRORS, __glXDispatch, __GLX_NUMBER_ERRORS, __glXDispatch,
__glXSwapDispatch, ResetExtension, __glXDispatch, ResetExtension,
StandardMinorOpcode); StandardMinorOpcode);
if (!extEntry) { if (!extEntry) {
FatalError("__glXExtensionInit: AddExtensions failed\n"); FatalError("__glXExtensionInit: AddExtensions failed\n");
...@@ -445,53 +444,10 @@ static int __glXDispatch(ClientPtr client) ...@@ -445,53 +444,10 @@ static int __glXDispatch(ClientPtr client)
/* /*
** Use the opcode to index into the procedure table. ** Use the opcode to index into the procedure table.
*/ */
proc = __glXSingleTable[opcode]; if (client->swapped)
return (*proc)(cl, (GLbyte *) stuff); proc = __glXSwapSingleTable[opcode];
} else
proc = __glXSingleTable[opcode];
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];
return (*proc)(cl, (GLbyte *) stuff); return (*proc)(cl, (GLbyte *) stuff);
} }
......
nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc
View file @ 39d45a0e
...@@ -61,16 +61,16 @@ LinkSourceFile(traverse_wrap.h, $(MESASRCDIR)/src/mesa/shader/slang) ...@@ -61,16 +61,16 @@ LinkSourceFile(traverse_wrap.h, $(MESASRCDIR)/src/mesa/shader/slang)
MESA_SLANG_UOBJS = $(MESA_SLANG_OBJS) MESA_SLANG_UOBJS = $(MESA_SLANG_OBJS)
#endif #endif
MESA_SLANG_DOBJS = $(MESASLANGBUILDDIR)debuggerslang_assemble_assignment.o \ MESA_SLANG_DOBJS = $(MESASLANGBUILDDIR)debugger/slang_assemble_assignment.o \
$(MESASLANGBUILDDIR)debuggerslang_assemble.o \ $(MESASLANGBUILDDIR)debugger/slang_assemble.o \
$(MESASLANGBUILDDIR)debuggerslang_assemble_conditional.o \ $(MESASLANGBUILDDIR)debugger/slang_assemble_conditional.o \
$(MESASLANGBUILDDIR)debuggerslang_assemble_constructor.o \ $(MESASLANGBUILDDIR)debugger/slang_assemble_constructor.o \
$(MESASLANGBUILDDIR)debuggerslang_assemble_typeinfo.o \ $(MESASLANGBUILDDIR)debugger/slang_assemble_typeinfo.o \
$(MESASLANGBUILDDIR)debuggerslang_compile.o \ $(MESASLANGBUILDDIR)debugger/slang_compile.o \
$(MESASLANGBUILDDIR)debuggerslang_execute.o \ $(MESASLANGBUILDDIR)debugger/slang_execute.o \
$(MESASLANGBUILDDIR)debuggerslang_preprocess.o \ $(MESASLANGBUILDDIR)debugger/slang_preprocess.o \
$(MESASLANGBUILDDIR)debuggerslang_storage.o \ $(MESASLANGBUILDDIR)debugger/slang_storage.o \
$(MESASLANGBUILDDIR)debuggerslang_utility.o $(MESASLANGBUILDDIR)debugger/slang_utility.o
MESA_SLANG_POBJS = $(MESASLANGBUILDDIR)profiled/slang_assemble_assignment.o \ MESA_SLANG_POBJS = $(MESASLANGBUILDDIR)profiled/slang_assemble_assignment.o \
$(MESASLANGBUILDDIR)profiled/slang_assemble.o \ $(MESASLANGBUILDDIR)profiled/slang_assemble.o \
......
nx-X11/programs/Xserver/hw/nxagent/NXglxext.c
View file @ 39d45a0e
...@@ -57,12 +57,11 @@ ...@@ -57,12 +57,11 @@
*/ */
static int __glXDispatch(ClientPtr client) static int __glXDispatch(ClientPtr client)
{ {
int result;
REQUEST(xGLXSingleReq); REQUEST(xGLXSingleReq);
CARD8 opcode; CARD8 opcode;
int (*proc)(__GLXclientState *cl, GLbyte *pc); int (*proc)(__GLXclientState *cl, GLbyte *pc);
__GLXclientState *cl; __GLXclientState *cl;
int retval;
opcode = stuff->glxCode; opcode = stuff->glxCode;
cl = __glXClients[client->index]; cl = __glXClients[client->index];
...@@ -107,77 +106,10 @@ static int __glXDispatch(ClientPtr client) ...@@ -107,77 +106,10 @@ static int __glXDispatch(ClientPtr client)
/* /*
** Use the opcode to index into the procedure table. ** Use the opcode to index into the procedure table.
*/ */
proc = __glXSingleTable[opcode]; if (client->swapped)
proc = __glXSwapSingleTable[opcode];
/* else
* Report upstream that we are proc = __glXSingleTable[opcode];
* 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];
/* /*
* Report upstream that we are * Report upstream that we are
...@@ -191,7 +123,7 @@ static int __glXSwapDispatch(ClientPtr client) ...@@ -191,7 +123,7 @@ static int __glXSwapDispatch(ClientPtr client)
opcode, client -> index); opcode, client -> index);
#endif #endif
result = (*proc)(cl, (GLbyte *) stuff); retval = (*proc)(cl, (GLbyte *) stuff);
nxagentGlxTrap = 0; nxagentGlxTrap = 0;
...@@ -200,5 +132,5 @@ static int __glXSwapDispatch(ClientPtr client) ...@@ -200,5 +132,5 @@ static int __glXSwapDispatch(ClientPtr client)
opcode, client -> index); opcode, client -> index);
#endif #endif
return result; return retval;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment