diff options
Diffstat (limited to 'xorg-server/glx/indirect_dispatch_swap.c')
-rw-r--r-- | xorg-server/glx/indirect_dispatch_swap.c | 271 |
1 files changed, 166 insertions, 105 deletions
diff --git a/xorg-server/glx/indirect_dispatch_swap.c b/xorg-server/glx/indirect_dispatch_swap.c index 3221c809d..aa37e5e01 100644 --- a/xorg-server/glx/indirect_dispatch_swap.c +++ b/xorg-server/glx/indirect_dispatch_swap.c @@ -24,6 +24,13 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#else + +#include "glheader.h" + +#endif #include <X11/Xmd.h> #include <GL/gl.h> @@ -76,6 +83,14 @@ bswap_ENUM( const void * src ) return x.ret; } +static GLsync +bswap_CARD64( const void * src ) +{ + union { uint64_t dst; GLsync ret; } x; + x.dst = bswap_64( *(uint64_t *) src ); + return x.ret; +} + static GLdouble bswap_FLOAT64( const void * src ) { @@ -135,7 +150,7 @@ int __glXDispSwap_NewList(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -153,7 +168,7 @@ int __glXDispSwap_EndList(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -206,7 +221,7 @@ int __glXDispSwap_DeleteLists(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -224,7 +239,7 @@ int __glXDispSwap_GenLists(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -255,7 +270,7 @@ void __glXDispSwap_Begin(GLbyte * pc) void __glXDispSwap_Bitmap(GLbyte * pc) { - const GLubyte * const bitmap = (const GLubyte *) (pc + 44); + const GLubyte * const bitmap = (const GLubyte *) ((pc + 44)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) ); @@ -1132,7 +1147,7 @@ void __glXDispSwap_PolygonMode(GLbyte * pc) void __glXDispSwap_PolygonStipple(GLbyte * pc) { - const GLubyte * const mask = (const GLubyte *) (pc + 20); + const GLubyte * const mask = (const GLubyte *) ((pc + 20)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) ); @@ -1211,7 +1226,7 @@ void __glXDispSwap_TexParameteriv(GLbyte * pc) void __glXDispSwap_TexImage1D(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) (pc + 52); + const GLvoid * const pixels = (const GLvoid *) ((pc + 52)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -1235,7 +1250,7 @@ void __glXDispSwap_TexImage1D(GLbyte * pc) void __glXDispSwap_TexImage2D(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) (pc + 52); + const GLvoid * const pixels = (const GLvoid *) ((pc + 52)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -1756,7 +1771,7 @@ int __glXDispSwap_PixelStoref(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1774,7 +1789,7 @@ int __glXDispSwap_PixelStorei(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1841,7 +1856,7 @@ void __glXDispSwap_CopyPixels(GLbyte * pc) void __glXDispSwap_DrawPixels(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) (pc + 36); + const GLvoid * const pixels = (const GLvoid *) ((pc + 36)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -1864,7 +1879,7 @@ int __glXDispSwap_GetBooleanv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1892,7 +1907,7 @@ int __glXDispSwap_GetClipPlane(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1913,7 +1928,7 @@ int __glXDispSwap_GetDoublev(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1942,7 +1957,7 @@ int __glXDispSwap_GetError(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1959,7 +1974,7 @@ int __glXDispSwap_GetFloatv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1988,7 +2003,7 @@ int __glXDispSwap_GetIntegerv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2017,7 +2032,7 @@ int __glXDispSwap_GetLightfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2047,7 +2062,7 @@ int __glXDispSwap_GetLightiv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2077,7 +2092,7 @@ int __glXDispSwap_GetMapdv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2108,7 +2123,7 @@ int __glXDispSwap_GetMapfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2139,7 +2154,7 @@ int __glXDispSwap_GetMapiv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2170,7 +2185,7 @@ int __glXDispSwap_GetMaterialfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2200,7 +2215,7 @@ int __glXDispSwap_GetMaterialiv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2230,7 +2245,7 @@ int __glXDispSwap_GetPixelMapfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2259,7 +2274,7 @@ int __glXDispSwap_GetPixelMapuiv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2288,7 +2303,7 @@ int __glXDispSwap_GetPixelMapusv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2317,7 +2332,7 @@ int __glXDispSwap_GetTexEnvfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2347,7 +2362,7 @@ int __glXDispSwap_GetTexEnviv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2377,7 +2392,7 @@ int __glXDispSwap_GetTexGendv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2407,7 +2422,7 @@ int __glXDispSwap_GetTexGenfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2437,7 +2452,7 @@ int __glXDispSwap_GetTexGeniv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2467,7 +2482,7 @@ int __glXDispSwap_GetTexParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2497,7 +2512,7 @@ int __glXDispSwap_GetTexParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2527,7 +2542,7 @@ int __glXDispSwap_GetTexLevelParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2558,7 +2573,7 @@ int __glXDispSwap_GetTexLevelParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2589,7 +2604,7 @@ int __glXDispSwap_IsEnabled(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2608,7 +2623,7 @@ int __glXDispSwap_IsList(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2854,7 +2869,7 @@ int __glXDispSwap_AreTexturesResident(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2879,7 +2894,7 @@ int __glXDispSwap_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -2957,7 +2972,7 @@ int __glXDispSwap_DeleteTextures(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2977,7 +2992,7 @@ int __glXDispSwap_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -2997,7 +3012,7 @@ int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3021,7 +3036,7 @@ int __glXDispSwap_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3045,7 +3060,7 @@ int __glXDispSwap_IsTexture(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3064,7 +3079,7 @@ int __glXDispSwap_IsTextureEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3092,7 +3107,7 @@ void __glXDispSwap_PrioritizeTextures(GLbyte * pc) void __glXDispSwap_TexSubImage1D(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) (pc + 56); + const GLvoid * const pixels = (const GLvoid *) ((pc + 56)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3115,7 +3130,7 @@ void __glXDispSwap_TexSubImage1D(GLbyte * pc) void __glXDispSwap_TexSubImage2D(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) (pc + 56); + const GLvoid * const pixels = (const GLvoid *) ((pc + 56)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3157,7 +3172,7 @@ void __glXDispSwap_BlendEquation(GLbyte * pc) void __glXDispSwap_ColorTable(GLbyte * pc) { - const GLvoid * const table = (const GLvoid *) (pc + 40); + const GLvoid * const table = (const GLvoid *) ((pc + 40)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3220,7 +3235,7 @@ int __glXDispSwap_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3250,7 +3265,7 @@ int __glXDispSwap_GetColorTableParameterfvSGI(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3280,7 +3295,7 @@ int __glXDispSwap_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3310,7 +3325,7 @@ int __glXDispSwap_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3338,7 +3353,7 @@ int __glXDispSwap_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc) void __glXDispSwap_ColorSubTable(GLbyte * pc) { - const GLvoid * const data = (const GLvoid *) (pc + 40); + const GLvoid * const data = (const GLvoid *) ((pc + 40)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3371,7 +3386,7 @@ void __glXDispSwap_CopyColorSubTable(GLbyte * pc) void __glXDispSwap_ConvolutionFilter1D(GLbyte * pc) { - const GLvoid * const image = (const GLvoid *) (pc + 44); + const GLvoid * const image = (const GLvoid *) ((pc + 44)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3393,7 +3408,7 @@ void __glXDispSwap_ConvolutionFilter1D(GLbyte * pc) void __glXDispSwap_ConvolutionFilter2D(GLbyte * pc) { - const GLvoid * const image = (const GLvoid *) (pc + 44); + const GLvoid * const image = (const GLvoid *) ((pc + 44)); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -3487,7 +3502,7 @@ int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3517,7 +3532,7 @@ int __glXDispSwap_GetConvolutionParameterfvEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3547,7 +3562,7 @@ int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3577,7 +3592,7 @@ int __glXDispSwap_GetConvolutionParameterivEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3607,7 +3622,7 @@ int __glXDispSwap_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3637,7 +3652,7 @@ int __glXDispSwap_GetHistogramParameterfvEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3667,7 +3682,7 @@ int __glXDispSwap_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3697,7 +3712,7 @@ int __glXDispSwap_GetHistogramParameterivEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3727,7 +3742,7 @@ int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3757,7 +3772,7 @@ int __glXDispSwap_GetMinmaxParameterfvEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3787,7 +3802,7 @@ int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3817,7 +3832,7 @@ int __glXDispSwap_GetMinmaxParameterivEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3907,7 +3922,7 @@ void __glXDispSwap_TexImage3D(GLbyte * pc) void __glXDispSwap_TexSubImage3D(GLbyte * pc) { - const GLvoid * const pixels = (const GLvoid *) (pc + 88); + const GLvoid * const pixels = (const GLvoid *) ((pc + 88)); __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); @@ -4223,7 +4238,7 @@ int __glXDispSwap_GetProgramEnvParameterdvARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4245,7 +4260,7 @@ int __glXDispSwap_GetProgramEnvParameterfvARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4267,7 +4282,7 @@ int __glXDispSwap_GetProgramLocalParameterdvARB(__GLXclientState *cl, GLbyte *pc { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4289,7 +4304,7 @@ int __glXDispSwap_GetProgramLocalParameterfvARB(__GLXclientState *cl, GLbyte *pc { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4311,7 +4326,7 @@ int __glXDispSwap_GetProgramivARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4341,7 +4356,7 @@ int __glXDispSwap_GetVertexAttribdvARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4371,7 +4386,7 @@ int __glXDispSwap_GetVertexAttribfvARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4401,7 +4416,7 @@ int __glXDispSwap_GetVertexAttribivARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4713,7 +4728,7 @@ int __glXDispSwap_DeleteQueriesARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4740,7 +4755,7 @@ int __glXDispSwap_GenQueriesARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4764,7 +4779,7 @@ int __glXDispSwap_GetQueryObjectivARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4794,7 +4809,7 @@ int __glXDispSwap_GetQueryObjectuivARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4824,7 +4839,7 @@ int __glXDispSwap_GetQueryivARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4854,7 +4869,7 @@ int __glXDispSwap_IsQueryARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4879,6 +4894,25 @@ void __glXDispSwap_DrawBuffersARB(GLbyte * pc) ) ); } +void __glXDispSwap_ClampColorARB(GLbyte * pc) +{ + CALL_ClampColorARB( GET_DISPATCH(), ( + (GLenum )bswap_ENUM ( pc + 0 ), + (GLenum )bswap_ENUM ( pc + 4 ) + ) ); +} + +void __glXDispSwap_RenderbufferStorageMultisample(GLbyte * pc) +{ + CALL_RenderbufferStorageMultisample( GET_DISPATCH(), ( + (GLenum )bswap_ENUM ( pc + 0 ), + (GLsizei )bswap_CARD32 ( pc + 4 ), + (GLenum )bswap_ENUM ( pc + 8 ), + (GLsizei )bswap_CARD32 ( pc + 12 ), + (GLsizei )bswap_CARD32 ( pc + 16 ) + ) ); +} + void __glXDispSwap_SampleMaskSGIS(GLbyte * pc) { CALL_SampleMaskSGIS( GET_DISPATCH(), ( @@ -5020,7 +5054,7 @@ int __glXDispSwap_AreProgramsResidentNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5053,7 +5087,7 @@ int __glXDispSwap_DeleteProgramsNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5082,7 +5116,7 @@ int __glXDispSwap_GenProgramsNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5106,7 +5140,7 @@ int __glXDispSwap_GetProgramParameterdvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5129,7 +5163,7 @@ int __glXDispSwap_GetProgramParameterfvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5152,7 +5186,7 @@ int __glXDispSwap_GetProgramivNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5182,7 +5216,7 @@ int __glXDispSwap_GetTrackMatrixivNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5205,7 +5239,7 @@ int __glXDispSwap_GetVertexAttribdvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5235,7 +5269,7 @@ int __glXDispSwap_GetVertexAttribfvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5265,7 +5299,7 @@ int __glXDispSwap_GetVertexAttribivNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5295,7 +5329,7 @@ int __glXDispSwap_IsProgramNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5324,7 +5358,7 @@ void __glXDispSwap_LoadProgramNV(GLbyte * pc) void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc) { - const GLuint num = (GLuint )bswap_CARD32 ( pc + 8 ); + const GLsizei num = (GLsizei )bswap_CARD32 ( pc + 8 ); #ifdef __GLX_ALIGN64 const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4; @@ -5344,7 +5378,7 @@ void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc) void __glXDispSwap_ProgramParameters4fvNV(GLbyte * pc) { - const GLuint num = (GLuint )bswap_CARD32 ( pc + 8 ); + const GLsizei num = (GLsizei )bswap_CARD32 ( pc + 8 ); CALL_ProgramParameters4fvNV( GET_DISPATCH(), ( (GLenum )bswap_ENUM ( pc + 0 ), @@ -5713,7 +5747,7 @@ int __glXDispSwap_GetProgramNamedParameterdvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5738,7 +5772,7 @@ int __glXDispSwap_GetProgramNamedParameterfvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5819,7 +5853,7 @@ int __glXDispSwap_CheckFramebufferStatusEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5902,7 +5936,7 @@ int __glXDispSwap_GenFramebuffersEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5926,7 +5960,7 @@ int __glXDispSwap_GenRenderbuffersEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5957,7 +5991,7 @@ int __glXDispSwap_GetFramebufferAttachmentParameterivEXT(__GLXclientState *cl, G { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5980,7 +6014,7 @@ int __glXDispSwap_GetRenderbufferParameterivEXT(__GLXclientState *cl, GLbyte *pc { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -6002,7 +6036,7 @@ int __glXDispSwap_IsFramebufferEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -6021,7 +6055,7 @@ int __glXDispSwap_IsRenderbufferEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); + struct glx_context * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -6046,3 +6080,30 @@ void __glXDispSwap_RenderbufferStorageEXT(GLbyte * pc) ) ); } +void __glXDispSwap_BlitFramebufferEXT(GLbyte * pc) +{ + CALL_BlitFramebufferEXT( GET_DISPATCH(), ( + (GLint )bswap_CARD32 ( pc + 0 ), + (GLint )bswap_CARD32 ( pc + 4 ), + (GLint )bswap_CARD32 ( pc + 8 ), + (GLint )bswap_CARD32 ( pc + 12 ), + (GLint )bswap_CARD32 ( pc + 16 ), + (GLint )bswap_CARD32 ( pc + 20 ), + (GLint )bswap_CARD32 ( pc + 24 ), + (GLint )bswap_CARD32 ( pc + 28 ), + (GLbitfield)bswap_CARD32 ( pc + 32 ), + (GLenum )bswap_ENUM ( pc + 36 ) + ) ); +} + +void __glXDispSwap_FramebufferTextureLayerEXT(GLbyte * pc) +{ + CALL_FramebufferTextureLayerEXT( GET_DISPATCH(), ( + (GLenum )bswap_ENUM ( pc + 0 ), + (GLenum )bswap_ENUM ( pc + 4 ), + (GLuint )bswap_CARD32 ( pc + 8 ), + (GLint )bswap_CARD32 ( pc + 12 ), + (GLint )bswap_CARD32 ( pc + 16 ) + ) ); +} + |