Memo to myself: Whenever a Makefile.am changes, autogen.sh must be
re-run. This is especially true if the change is to remove a source file. Fix RenderLarge to actually use the new protocol decode tables.
This commit is contained in:
parent
f6fd7d8f83
commit
866bb3f340
|
@ -1814,7 +1814,6 @@ int __glXDisp_RenderLarge(__GLXclientState *cl, GLbyte *pc)
|
||||||
xGLXRenderLargeReq *req;
|
xGLXRenderLargeReq *req;
|
||||||
ClientPtr client= cl->client;
|
ClientPtr client= cl->client;
|
||||||
GLuint dataBytes;
|
GLuint dataBytes;
|
||||||
__GLXdispatchRenderProcPtr proc;
|
|
||||||
__GLXrenderLargeHeader *hdr;
|
__GLXrenderLargeHeader *hdr;
|
||||||
__GLXcontext *glxc;
|
__GLXcontext *glxc;
|
||||||
int error;
|
int error;
|
||||||
|
@ -1873,13 +1872,6 @@ int __glXDisp_RenderLarge(__GLXclientState *cl, GLbyte *pc)
|
||||||
return __glXError(GLXBadLargeRequest);
|
return __glXError(GLXBadLargeRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
proc = (__GLXdispatchRenderProcPtr)
|
|
||||||
__glXGetProtocolDecodeFunction(& Render_dispatch_info, opcode, 0);
|
|
||||||
if (proc == NULL) {
|
|
||||||
client->errorValue = opcode;
|
|
||||||
return __glXError(GLXBadLargeRequest);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (entry.varsize) {
|
if (entry.varsize) {
|
||||||
/*
|
/*
|
||||||
** If it's a variable-size command (a command whose length must
|
** If it's a variable-size command (a command whose length must
|
||||||
|
@ -1956,6 +1948,8 @@ int __glXDisp_RenderLarge(__GLXclientState *cl, GLbyte *pc)
|
||||||
cl->largeCmdRequestsSoFar++;
|
cl->largeCmdRequestsSoFar++;
|
||||||
|
|
||||||
if (req->requestNumber == cl->largeCmdRequestsTotal) {
|
if (req->requestNumber == cl->largeCmdRequestsTotal) {
|
||||||
|
__GLXdispatchRenderProcPtr proc;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** This is the last request; it must have enough bytes to complete
|
** This is the last request; it must have enough bytes to complete
|
||||||
** the command.
|
** the command.
|
||||||
|
@ -1981,16 +1975,9 @@ int __glXDisp_RenderLarge(__GLXclientState *cl, GLbyte *pc)
|
||||||
/*
|
/*
|
||||||
** Use the opcode to index into the procedure table.
|
** Use the opcode to index into the procedure table.
|
||||||
*/
|
*/
|
||||||
if ( (opcode >= __GLX_MIN_RENDER_OPCODE) &&
|
proc = (__GLXdispatchRenderProcPtr)
|
||||||
(opcode <= __GLX_MAX_RENDER_OPCODE) ) {
|
__glXGetProtocolDecodeFunction(& Render_dispatch_info, opcode, 0);
|
||||||
proc = __glXRenderTable[opcode];
|
if (proc == NULL) {
|
||||||
#if __GLX_MAX_RENDER_OPCODE_EXT > __GLX_MIN_RENDER_OPCODE_EXT
|
|
||||||
} else if ( (opcode >= __GLX_MIN_RENDER_OPCODE_EXT) &&
|
|
||||||
(opcode <= __GLX_MAX_RENDER_OPCODE_EXT) ) {
|
|
||||||
opcode -= __GLX_MIN_RENDER_OPCODE_EXT;
|
|
||||||
proc = __glXRenderTable_EXT[opcode];
|
|
||||||
#endif /* __GLX_MAX_RENDER_OPCODE_EXT > __GLX_MIN_RENDER_OPCODE_EXT */
|
|
||||||
} else {
|
|
||||||
client->errorValue = opcode;
|
client->errorValue = opcode;
|
||||||
return __glXError(GLXBadLargeRequest);
|
return __glXError(GLXBadLargeRequest);
|
||||||
}
|
}
|
||||||
|
|
|
@ -736,7 +736,6 @@ int __glXDispSwap_RenderLarge(__GLXclientState *cl, GLbyte *pc)
|
||||||
xGLXRenderLargeReq *req;
|
xGLXRenderLargeReq *req;
|
||||||
ClientPtr client= cl->client;
|
ClientPtr client= cl->client;
|
||||||
size_t dataBytes;
|
size_t dataBytes;
|
||||||
__GLXdispatchRenderProcPtr proc;
|
|
||||||
__GLXrenderLargeHeader *hdr;
|
__GLXrenderLargeHeader *hdr;
|
||||||
__GLXcontext *cx;
|
__GLXcontext *cx;
|
||||||
int error;
|
int error;
|
||||||
|
@ -800,13 +799,6 @@ int __glXDispSwap_RenderLarge(__GLXclientState *cl, GLbyte *pc)
|
||||||
return __glXError(GLXBadLargeRequest);
|
return __glXError(GLXBadLargeRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
proc = (__GLXdispatchRenderProcPtr)
|
|
||||||
__glXGetProtocolDecodeFunction(& Render_dispatch_info, opcode, 0);
|
|
||||||
if (proc == NULL) {
|
|
||||||
client->errorValue = opcode;
|
|
||||||
return __glXError(GLXBadLargeRequest);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (entry.varsize) {
|
if (entry.varsize) {
|
||||||
/*
|
/*
|
||||||
** If it's a variable-size command (a command whose length must
|
** If it's a variable-size command (a command whose length must
|
||||||
|
@ -882,6 +874,8 @@ int __glXDispSwap_RenderLarge(__GLXclientState *cl, GLbyte *pc)
|
||||||
cl->largeCmdRequestsSoFar++;
|
cl->largeCmdRequestsSoFar++;
|
||||||
|
|
||||||
if (req->requestNumber == cl->largeCmdRequestsTotal) {
|
if (req->requestNumber == cl->largeCmdRequestsTotal) {
|
||||||
|
__GLXdispatchRenderProcPtr proc;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** This is the last request; it must have enough bytes to complete
|
** This is the last request; it must have enough bytes to complete
|
||||||
** the command.
|
** the command.
|
||||||
|
@ -911,16 +905,10 @@ int __glXDispSwap_RenderLarge(__GLXclientState *cl, GLbyte *pc)
|
||||||
** Use the opcode to index into the procedure table.
|
** Use the opcode to index into the procedure table.
|
||||||
*/
|
*/
|
||||||
opcode = hdr->opcode;
|
opcode = hdr->opcode;
|
||||||
if ( (opcode >= __GLX_MIN_RENDER_OPCODE) &&
|
|
||||||
(opcode <= __GLX_MAX_RENDER_OPCODE) ) {
|
proc = (__GLXdispatchRenderProcPtr)
|
||||||
proc = __glXSwapRenderTable[opcode];
|
__glXGetProtocolDecodeFunction(& Render_dispatch_info, opcode, 1);
|
||||||
#if __GLX_MAX_RENDER_OPCODE_EXT > __GLX_MIN_RENDER_OPCODE_EXT
|
if (proc == NULL) {
|
||||||
} else if ( (opcode >= __GLX_MIN_RENDER_OPCODE_EXT) &&
|
|
||||||
(opcode <= __GLX_MAX_RENDER_OPCODE_EXT) ) {
|
|
||||||
int index = opcode - __GLX_MIN_RENDER_OPCODE_EXT;
|
|
||||||
proc = __glXSwapRenderTable_EXT[index];
|
|
||||||
#endif /* __GLX_MAX_RENDER_OPCODE_EXT > __GLX_MIN_RENDER_OPCODE_EXT */
|
|
||||||
} else {
|
|
||||||
client->errorValue = opcode;
|
client->errorValue = opcode;
|
||||||
return __glXError(GLXBadLargeRequest);
|
return __glXError(GLXBadLargeRequest);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user