diff options
Diffstat (limited to 'xorg-server/glx/indirect_dispatch.c')
-rw-r--r-- | xorg-server/glx/indirect_dispatch.c | 231 |
1 files changed, 138 insertions, 93 deletions
diff --git a/xorg-server/glx/indirect_dispatch.c b/xorg-server/glx/indirect_dispatch.c index ecd2bc8de..20d32b105 100644 --- a/xorg-server/glx/indirect_dispatch.c +++ b/xorg-server/glx/indirect_dispatch.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> @@ -56,7 +63,7 @@ int __glXDisp_NewList(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -74,7 +81,7 @@ int __glXDisp_EndList(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -109,7 +116,7 @@ int __glXDisp_DeleteLists(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -127,7 +134,7 @@ int __glXDisp_GenLists(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1659,7 +1666,7 @@ int __glXDisp_PixelStoref(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1677,7 +1684,7 @@ int __glXDisp_PixelStorei(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1767,7 +1774,7 @@ int __glXDisp_GetBooleanv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1795,7 +1802,7 @@ int __glXDisp_GetClipPlane(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1815,7 +1822,7 @@ int __glXDisp_GetDoublev(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1843,7 +1850,7 @@ int __glXDisp_GetError(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1860,7 +1867,7 @@ int __glXDisp_GetFloatv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1888,7 +1895,7 @@ int __glXDisp_GetIntegerv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1916,7 +1923,7 @@ int __glXDisp_GetLightfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1945,7 +1952,7 @@ int __glXDisp_GetLightiv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -1974,7 +1981,7 @@ int __glXDisp_GetMapdv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2004,7 +2011,7 @@ int __glXDisp_GetMapfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2034,7 +2041,7 @@ int __glXDisp_GetMapiv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2064,7 +2071,7 @@ int __glXDisp_GetMaterialfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2093,7 +2100,7 @@ int __glXDisp_GetMaterialiv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2122,7 +2129,7 @@ int __glXDisp_GetPixelMapfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2150,7 +2157,7 @@ int __glXDisp_GetPixelMapuiv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2178,7 +2185,7 @@ int __glXDisp_GetPixelMapusv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2206,7 +2213,7 @@ int __glXDisp_GetTexEnvfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2235,7 +2242,7 @@ int __glXDisp_GetTexEnviv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2264,7 +2271,7 @@ int __glXDisp_GetTexGendv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2293,7 +2300,7 @@ int __glXDisp_GetTexGenfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2322,7 +2329,7 @@ int __glXDisp_GetTexGeniv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2351,7 +2358,7 @@ int __glXDisp_GetTexParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2380,7 +2387,7 @@ int __glXDisp_GetTexParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2409,7 +2416,7 @@ int __glXDisp_GetTexLevelParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2439,7 +2446,7 @@ int __glXDisp_GetTexLevelParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2469,7 +2476,7 @@ int __glXDisp_IsEnabled(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2488,7 +2495,7 @@ int __glXDisp_IsList(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2734,7 +2741,7 @@ int __glXDisp_AreTexturesResident(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2759,7 +2766,7 @@ int __glXDisp_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -2837,7 +2844,7 @@ int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2857,7 +2864,7 @@ int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -2877,7 +2884,7 @@ int __glXDisp_GenTextures(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2900,7 +2907,7 @@ int __glXDisp_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -2923,7 +2930,7 @@ int __glXDisp_IsTexture(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -2942,7 +2949,7 @@ int __glXDisp_IsTextureEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3098,7 +3105,7 @@ int __glXDisp_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3127,7 +3134,7 @@ int __glXDisp_GetColorTableParameterfvSGI(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3156,7 +3163,7 @@ int __glXDisp_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3185,7 +3192,7 @@ int __glXDisp_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3361,7 +3368,7 @@ int __glXDisp_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3390,7 +3397,7 @@ int __glXDisp_GetConvolutionParameterfvEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3419,7 +3426,7 @@ int __glXDisp_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3448,7 +3455,7 @@ int __glXDisp_GetConvolutionParameterivEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3477,7 +3484,7 @@ int __glXDisp_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3506,7 +3513,7 @@ int __glXDisp_GetHistogramParameterfvEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3535,7 +3542,7 @@ int __glXDisp_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3564,7 +3571,7 @@ int __glXDisp_GetHistogramParameterivEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3593,7 +3600,7 @@ int __glXDisp_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3622,7 +3629,7 @@ int __glXDisp_GetMinmaxParameterfvEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -3651,7 +3658,7 @@ int __glXDisp_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -3680,7 +3687,7 @@ int __glXDisp_GetMinmaxParameterivEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4085,7 +4092,7 @@ int __glXDisp_GetProgramEnvParameterdvARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4106,7 +4113,7 @@ int __glXDisp_GetProgramEnvParameterfvARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4127,7 +4134,7 @@ int __glXDisp_GetProgramLocalParameterdvARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4148,7 +4155,7 @@ int __glXDisp_GetProgramLocalParameterfvARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4169,7 +4176,7 @@ int __glXDisp_GetProgramivARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4198,7 +4205,7 @@ int __glXDisp_GetVertexAttribdvARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4227,7 +4234,7 @@ int __glXDisp_GetVertexAttribfvARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4256,7 +4263,7 @@ int __glXDisp_GetVertexAttribivARB(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4567,7 +4574,7 @@ int __glXDisp_DeleteQueriesARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4594,7 +4601,7 @@ int __glXDisp_GenQueriesARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4617,7 +4624,7 @@ int __glXDisp_GetQueryObjectivARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4646,7 +4653,7 @@ int __glXDisp_GetQueryObjectuivARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4675,7 +4682,7 @@ int __glXDisp_GetQueryivARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4704,7 +4711,7 @@ int __glXDisp_IsQueryARB(__GLXclientState *cl, GLbyte *pc) { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_SINGLE_HDR_SIZE; if ( cx != NULL ) { @@ -4729,6 +4736,17 @@ void __glXDisp_DrawBuffersARB(GLbyte * pc) ) ); } +void __glXDisp_RenderbufferStorageMultisample(GLbyte * pc) +{ + CALL_RenderbufferStorageMultisample( GET_DISPATCH(), ( + *(GLenum *)(pc + 0), + *(GLsizei *)(pc + 4), + *(GLenum *)(pc + 8), + *(GLsizei *)(pc + 12), + *(GLsizei *)(pc + 16) + ) ); +} + void __glXDisp_SampleMaskSGIS(GLbyte * pc) { CALL_SampleMaskSGIS( GET_DISPATCH(), ( @@ -4870,7 +4888,7 @@ int __glXDisp_AreProgramsResidentNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4903,7 +4921,7 @@ int __glXDisp_DeleteProgramsNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4932,7 +4950,7 @@ int __glXDisp_GenProgramsNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4955,7 +4973,7 @@ int __glXDisp_GetProgramParameterdvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4977,7 +4995,7 @@ int __glXDisp_GetProgramParameterfvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -4999,7 +5017,7 @@ int __glXDisp_GetProgramivNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5028,7 +5046,7 @@ int __glXDisp_GetTrackMatrixivNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5050,7 +5068,7 @@ int __glXDisp_GetVertexAttribdvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5079,7 +5097,7 @@ int __glXDisp_GetVertexAttribfvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5108,7 +5126,7 @@ int __glXDisp_GetVertexAttribivNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5137,7 +5155,7 @@ int __glXDisp_IsProgramNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5166,7 +5184,7 @@ void __glXDisp_LoadProgramNV(GLbyte * pc) void __glXDisp_ProgramParameters4dvNV(GLbyte * pc) { - const GLuint num = *(GLuint *)(pc + 8); + const GLsizei num = *(GLsizei *)(pc + 8); #ifdef __GLX_ALIGN64 const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4; @@ -5186,7 +5204,7 @@ void __glXDisp_ProgramParameters4dvNV(GLbyte * pc) void __glXDisp_ProgramParameters4fvNV(GLbyte * pc) { - const GLuint num = *(GLuint *)(pc + 8); + const GLsizei num = *(GLsizei *)(pc + 8); CALL_ProgramParameters4fvNV( GET_DISPATCH(), ( *(GLenum *)(pc + 0), @@ -5555,7 +5573,7 @@ int __glXDisp_GetProgramNamedParameterdvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5579,7 +5597,7 @@ int __glXDisp_GetProgramNamedParameterfvNV(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5659,7 +5677,7 @@ int __glXDisp_CheckFramebufferStatusEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5742,7 +5760,7 @@ int __glXDisp_GenFramebuffersEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5765,7 +5783,7 @@ int __glXDisp_GenRenderbuffersEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5795,7 +5813,7 @@ int __glXDisp_GetFramebufferAttachmentParameterivEXT(__GLXclientState *cl, GLbyt { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5817,7 +5835,7 @@ int __glXDisp_GetRenderbufferParameterivEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5838,7 +5856,7 @@ int __glXDisp_IsFramebufferEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5857,7 +5875,7 @@ int __glXDisp_IsRenderbufferEXT(__GLXclientState *cl, GLbyte *pc) { xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc; int error; - __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error); + struct glx_context * const cx = __glXForceCurrent(cl, req->contextTag, &error); pc += __GLX_VENDPRIV_HDR_SIZE; if ( cx != NULL ) { @@ -5882,3 +5900,30 @@ void __glXDisp_RenderbufferStorageEXT(GLbyte * pc) ) ); } +void __glXDisp_BlitFramebufferEXT(GLbyte * pc) +{ + CALL_BlitFramebufferEXT( GET_DISPATCH(), ( + *(GLint *)(pc + 0), + *(GLint *)(pc + 4), + *(GLint *)(pc + 8), + *(GLint *)(pc + 12), + *(GLint *)(pc + 16), + *(GLint *)(pc + 20), + *(GLint *)(pc + 24), + *(GLint *)(pc + 28), + *(GLbitfield *)(pc + 32), + *(GLenum *)(pc + 36) + ) ); +} + +void __glXDisp_FramebufferTextureLayerEXT(GLbyte * pc) +{ + CALL_FramebufferTextureLayerEXT( GET_DISPATCH(), ( + *(GLenum *)(pc + 0), + *(GLenum *)(pc + 4), + *(GLuint *)(pc + 8), + *(GLint *)(pc + 12), + *(GLint *)(pc + 16) + ) ); +} + |