svn merge ^/branches/released .

5 files changed, 323 insertions, 363 deletions

diff --git a/xorg-server/hw/dmx/glxProxy/glxserver.h b/xorg-server/hw/dmx/glxProxy/glxserver.h
index 17adce46a..b2be58219 100644
--- a/xorg-server/hw/dmx/glxProxy/glxserver.h
+++ b/xorg-server/hw/dmx/glxProxy/glxserver.h
@@ -1,317 +1,309 @@
-#ifndef _GLX_server_h_
-#define _GLX_server_h_
-
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-#include "dmx.h"
-
-#include <misc.h>
-#include <dixstruct.h>
-#include <pixmapstr.h>
-#include <gcstruct.h>
-#include <extnsionst.h>
-#include <resource.h>
-#include <scrnintstr.h>
-
-
-/*
-** The X header misc.h defines these math functions.
-*/
-#undef abs
-#undef fabs
-
-#define GL_GLEXT_PROTOTYPES /* we want prototypes */
-#include <GL/gl.h>
-#include <GL/glxproto.h>
-#include <GL/glxint.h>
-
-#include "glxscreens.h"
-#include "glxdrawable.h"
-#include "glxcontext.h"
-#include "glxerror.h"
-
-
-#define GLX_SERVER_MAJOR_VERSION 1
-#define GLX_SERVER_MINOR_VERSION 3
-
-#ifndef True
-#define True 1
-#endif
-#ifndef False
-#define False 0
-#endif
-
-/*
-** GLX resources.
-typedef XID GLXContextID;
-typedef XID GLXPixmap;
-typedef XID GLXDrawable;
-typedef XID GLXWindow;
-typedef XID GLXPbuffer;
-
-typedef struct __GLXcontextRec *GLXContext;
-*/
-typedef struct __GLXclientStateRec __GLXclientState;
-
-extern __GLXscreenInfo *__glXActiveScreens;
-extern GLint __glXNumActiveScreens;
-
-/************************************************************************/
-
-/*
-** The last context used (from the server's persective) is cached.
-*/
-extern __GLXcontext *__glXLastContext;
-extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*);
-
-/*
-** Macros to set, unset, and retrieve the flag that says whether a context
-** has unflushed commands.
-*/
-#define __GLX_NOTE_UNFLUSHED_CMDS(glxc) glxc->hasUnflushedCommands = GL_TRUE
-#define __GLX_NOTE_FLUSHED_CMDS(glxc) glxc->hasUnflushedCommands = GL_FALSE
-#define __GLX_HAS_UNFLUSHED_CMDS(glxc) (glxc->hasUnflushedCommands)
-
-/************************************************************************/
-
-typedef struct {
-   int elem_size;  /* element size in bytes */
-   int nelems;     /* number of elements to swap */
-   void (*swapfunc)(GLbyte *pc);
-} __GLXRenderSwapInfo;
-
-/*
-** State kept per client.
-*/
-struct __GLXclientStateRec {
-    /*
-    ** Whether this structure is currently being used to support a client.
-    */
-    Bool inUse;
-
-    /*
-    ** Buffer for returned data.
-    */
-    GLbyte *returnBuf;
-    GLint returnBufSize;
-
-    /*
-    ** Keep a list of all the contexts that are current for this client's
-    ** threads.
-    */
-    __GLXcontext **currentContexts;
-    DrawablePtr *currentDrawables;
-    GLint numCurrentContexts;
-
-    /* Back pointer to X client record */
-    ClientPtr client;
-
-    int GLClientmajorVersion;
-    int GLClientminorVersion;
-    char *GLClientextensions;
-
-    GLXContextTag  *be_currentCTag;
-    Display **be_displays;
-
-    /*
-    ** Keep track of large rendering commands, which span multiple requests.
-    */
-    GLint largeCmdBytesSoFar;		/* bytes received so far	*/
-    GLint largeCmdBytesTotal;		/* total bytes expected		*/
-    GLint largeCmdRequestsSoFar;	/* requests received so far	*/
-    GLint largeCmdRequestsTotal;	/* total requests expected	*/
-    void (*largeCmdRequestsSwapProc)(GLbyte *); 
-    __GLXRenderSwapInfo  *largeCmdRequestsSwap_info;
-    GLbyte *largeCmdBuf;
-    GLint largeCmdBufSize;
-    GLint largeCmdMaxReqDataSize;
-
-};
-
-extern __GLXclientState *__glXClients[];
-
-/************************************************************************/
-
-/*
-** Dispatch tables.
-*/
-typedef void (*__GLXdispatchRenderProcPtr)(GLbyte *);
-typedef int (*__GLXdispatchSingleProcPtr)(__GLXclientState *, GLbyte *);
-typedef int (*__GLXdispatchVendorPrivProcPtr)(__GLXclientState *, GLbyte *);
-extern __GLXdispatchSingleProcPtr __glXSingleTable[];
-extern __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[];
-extern __GLXdispatchSingleProcPtr __glXSwapSingleTable[];
-extern __GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[];
-extern __GLXdispatchRenderProcPtr __glXSwapRenderTable[];
-
-extern __GLXRenderSwapInfo __glXSwapRenderTable_EXT[];
-
-/*
- * Dispatch for GLX commands.
- */
-typedef int (*__GLXprocPtr)(__GLXclientState *, char *pc);
-extern __GLXprocPtr __glXProcTable[];
-
-/*
- * Tables for computing the size of each rendering command.
- */
-typedef struct {
-    int bytes;
-    int (*varsize)(GLbyte *pc, Bool swap);
-} __GLXrenderSizeData;
-extern __GLXrenderSizeData __glXRenderSizeTable[];
-extern __GLXrenderSizeData __glXRenderSizeTable_EXT[];
-
-/************************************************************************/
-
-/*
-** X resources.
-*/
-extern RESTYPE __glXContextRes;
-extern RESTYPE __glXClientRes;
-extern RESTYPE __glXPixmapRes;
-extern RESTYPE __glXDrawableRes;
-extern RESTYPE __glXWindowRes;
-extern RESTYPE __glXPbufferRes;
-
-/************************************************************************/
-
-/*
-** Prototypes.
-*/
-
-
-extern char *__glXcombine_strings(const char *, const char *);
-
-extern void __glXDisp_DrawArrays(GLbyte*);
-extern void __glXDispSwap_DrawArrays(GLbyte*);
-
-
-/*
-** Routines for sending swapped replies.
-*/
-
-extern void __glXSwapMakeCurrentReply(ClientPtr client,  
-                                      xGLXMakeCurrentReadSGIReply *reply);
-
-extern void __glXSwapIsDirectReply(ClientPtr client,
-				   xGLXIsDirectReply *reply);
-extern void __glXSwapQueryVersionReply(ClientPtr client,
-				       xGLXQueryVersionReply *reply);
-extern void __glXSwapQueryContextInfoEXTReply(ClientPtr client,
-					      xGLXQueryContextInfoEXTReply *reply,
-					      int *buf);
-extern void glxSwapQueryExtensionsStringReply(ClientPtr client,
-				xGLXQueryExtensionsStringReply *reply, char *buf);
-extern void glxSwapQueryServerStringReply(ClientPtr client,
-				xGLXQueryServerStringReply *reply, char *buf);
-extern void __glXSwapQueryContextReply(ClientPtr client,
-                                xGLXQueryContextReply *reply, int *buf);
-extern void __glXSwapGetDrawableAttributesReply(ClientPtr client,
-                             xGLXGetDrawableAttributesReply *reply, int *buf);
-extern void __glXSwapQueryMaxSwapBarriersSGIXReply(ClientPtr client,
-				   xGLXQueryMaxSwapBarriersSGIXReply *reply);
-
-/*
- * Routines for computing the size of variably-sized rendering commands.
- */
-
-extern int __glXTypeSize(GLenum enm);
-extern int __glXImageSize(GLenum format, GLenum type, GLsizei w, GLsizei h,
-			  GLint rowLength, GLint skipRows, GLint alignment);
-extern int __glXImage3DSize(GLenum format, GLenum type,
-			    GLsizei w, GLsizei h, GLsizei d,
-			    GLint imageHeight, GLint rowLength,
-			    GLint skipImages, GLint skipRows,
-			    GLint alignment);
-
-extern int __glXCallListsReqSize(GLbyte *pc, Bool swap);
-extern int __glXBitmapReqSize(GLbyte *pc, Bool swap);
-extern int __glXFogfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXFogivReqSize(GLbyte *pc, Bool swap);
-extern int __glXLightfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXLightivReqSize(GLbyte *pc, Bool swap);
-extern int __glXLightModelfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXLightModelivReqSize(GLbyte *pc, Bool swap);
-extern int __glXMaterialfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXMaterialivReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexParameterfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexParameterivReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexImage1DReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexImage2DReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexEnvfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexEnvivReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexGendvReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexGenfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexGenivReqSize(GLbyte *pc, Bool swap);
-extern int __glXMap1dReqSize(GLbyte *pc, Bool swap);
-extern int __glXMap1fReqSize(GLbyte *pc, Bool swap);
-extern int __glXMap2dReqSize(GLbyte *pc, Bool swap);
-extern int __glXMap2fReqSize(GLbyte *pc, Bool swap);
-extern int __glXPixelMapfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXPixelMapuivReqSize(GLbyte *pc, Bool swap);
-extern int __glXPixelMapusvReqSize(GLbyte *pc, Bool swap);
-extern int __glXDrawPixelsReqSize(GLbyte *pc, Bool swap);
-extern int __glXDrawArraysSize(GLbyte *pc, Bool swap);
-extern int __glXPrioritizeTexturesReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexSubImage1DReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexSubImage2DReqSize(GLbyte *pc, Bool swap);
-extern int __glXTexImage3DReqSize(GLbyte *pc, Bool swap );
-extern int __glXTexSubImage3DReqSize(GLbyte *pc, Bool swap);
-extern int __glXConvolutionFilter1DReqSize(GLbyte *pc, Bool swap);
-extern int __glXConvolutionFilter2DReqSize(GLbyte *pc, Bool swap);
-extern int __glXConvolutionParameterivReqSize(GLbyte *pc, Bool swap);
-extern int __glXConvolutionParameterfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXSeparableFilter2DReqSize(GLbyte *pc, Bool swap);
-extern int __glXColorTableReqSize(GLbyte *pc, Bool swap);
-extern int __glXColorSubTableReqSize(GLbyte *pc, Bool swap);
-extern int __glXColorTableParameterfvReqSize(GLbyte *pc, Bool swap);
-extern int __glXColorTableParameterivReqSize(GLbyte *pc, Bool swap);
-
-/*
- * Routines for computing the size of returned data.
- */
-extern int __glXConvolutionParameterivSize(GLenum pname);
-extern int __glXConvolutionParameterfvSize(GLenum pname);
-extern int __glXColorTableParameterfvSize(GLenum pname);
-extern int __glXColorTableParameterivSize(GLenum pname);
-
-extern void __glXFreeGLXWindow(__glXWindow *pGlxWindow);
-extern void __glXFreeGLXPbuffer(__glXPbuffer *pGlxPbuffer);
-
-extern int __glXVersionMajor;
-extern int __glXVersionMinor;
-
-#define __GLX_IS_VERSION_SUPPORTED(major,minor) \
-         ( (__glXVersionMajor > (major)) || \
-           ((__glXVersionMajor == (major)) && (__glXVersionMinor >= (minor))) )
-
-#endif /* !__GLX_server_h__ */
+#ifndef _GLX_server_h_

+#define _GLX_server_h_

+

+/*

+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice including the dates of first publication and

+ * either this permission notice or a reference to

+ * http://oss.sgi.com/projects/FreeB/

+ * shall be included in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+ * SOFTWARE.

+ *

+ * Except as contained in this notice, the name of Silicon Graphics, Inc.

+ * shall not be used in advertising or otherwise to promote the sale, use or

+ * other dealings in this Software without prior written authorization from

+ * Silicon Graphics, Inc.

+ */

+

+#include "dmx.h"

+

+#include <misc.h>

+#include <dixstruct.h>

+#include <pixmapstr.h>

+#include <gcstruct.h>

+#include <extnsionst.h>

+#include <resource.h>

+#include <scrnintstr.h>

+

+

+/*

+** The X header misc.h defines these math functions.

+*/

+#undef abs

+#undef fabs

+

+#define GL_GLEXT_PROTOTYPES /* we want prototypes */

+#include <GL/gl.h>

+#include <GL/glxproto.h>

+#include <GL/glxint.h>

+

+#include "glxscreens.h"

+#include "glxdrawable.h"

+#include "glxcontext.h"

+#include "glxerror.h"

+

+

+#define GLX_SERVER_MAJOR_VERSION 1

+#define GLX_SERVER_MINOR_VERSION 3

+

+#ifndef True

+#define True 1

+#endif

+#ifndef False

+#define False 0

+#endif

+

+/*

+** GLX resources.

+typedef XID GLXContextID;

+typedef XID GLXPixmap;

+typedef XID GLXDrawable;

+typedef XID GLXWindow;

+typedef XID GLXPbuffer;

+

+typedef struct __GLXcontextRec *GLXContext;

+*/

+typedef struct __GLXclientStateRec __GLXclientState;

+

+extern __GLXscreenInfo *__glXActiveScreens;

+extern GLint __glXNumActiveScreens;

+

+/************************************************************************/

+

+/*

+** The last context used (from the server's persective) is cached.

+*/

+extern __GLXcontext *__glXLastContext;

+extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*);

+

+/************************************************************************/

+

+typedef struct {

+   int elem_size;  /* element size in bytes */

+   int nelems;     /* number of elements to swap */

+   void (*swapfunc)(GLbyte *pc);

+} __GLXRenderSwapInfo;

+

+/*

+** State kept per client.

+*/

+struct __GLXclientStateRec {

+    /*

+    ** Whether this structure is currently being used to support a client.

+    */

+    Bool inUse;

+

+    /*

+    ** Buffer for returned data.

+    */

+    GLbyte *returnBuf;

+    GLint returnBufSize;

+

+    /*

+    ** Keep a list of all the contexts that are current for this client's

+    ** threads.

+    */

+    __GLXcontext **currentContexts;

+    DrawablePtr *currentDrawables;

+    GLint numCurrentContexts;

+

+    /* Back pointer to X client record */

+    ClientPtr client;

+

+    int GLClientmajorVersion;

+    int GLClientminorVersion;

+    char *GLClientextensions;

+

+    GLXContextTag  *be_currentCTag;

+    Display **be_displays;

+

+    /*

+    ** Keep track of large rendering commands, which span multiple requests.

+    */

+    GLint largeCmdBytesSoFar;		/* bytes received so far	*/

+    GLint largeCmdBytesTotal;		/* total bytes expected		*/

+    GLint largeCmdRequestsSoFar;	/* requests received so far	*/

+    GLint largeCmdRequestsTotal;	/* total requests expected	*/

+    void (*largeCmdRequestsSwapProc)(GLbyte *); 

+    __GLXRenderSwapInfo  *largeCmdRequestsSwap_info;

+    GLbyte *largeCmdBuf;

+    GLint largeCmdBufSize;

+    GLint largeCmdMaxReqDataSize;

+

+};

+

+extern __GLXclientState *__glXClients[];

+

+/************************************************************************/

+

+/*

+** Dispatch tables.

+*/

+typedef void (*__GLXdispatchRenderProcPtr)(GLbyte *);

+typedef int (*__GLXdispatchSingleProcPtr)(__GLXclientState *, GLbyte *);

+typedef int (*__GLXdispatchVendorPrivProcPtr)(__GLXclientState *, GLbyte *);

+extern __GLXdispatchSingleProcPtr __glXSingleTable[];

+extern __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[];

+extern __GLXdispatchSingleProcPtr __glXSwapSingleTable[];

+extern __GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[];

+extern __GLXdispatchRenderProcPtr __glXSwapRenderTable[];

+

+extern __GLXRenderSwapInfo __glXSwapRenderTable_EXT[];

+

+/*

+ * Dispatch for GLX commands.

+ */

+typedef int (*__GLXprocPtr)(__GLXclientState *, char *pc);

+extern __GLXprocPtr __glXProcTable[];

+

+/*

+ * Tables for computing the size of each rendering command.

+ */

+typedef struct {

+    int bytes;

+    int (*varsize)(GLbyte *pc, Bool swap);

+} __GLXrenderSizeData;

+extern __GLXrenderSizeData __glXRenderSizeTable[];

+extern __GLXrenderSizeData __glXRenderSizeTable_EXT[];

+

+/************************************************************************/

+

+/*

+** X resources.

+*/

+extern RESTYPE __glXContextRes;

+extern RESTYPE __glXClientRes;

+extern RESTYPE __glXPixmapRes;

+extern RESTYPE __glXDrawableRes;

+extern RESTYPE __glXWindowRes;

+extern RESTYPE __glXPbufferRes;

+

+/************************************************************************/

+

+/*

+** Prototypes.

+*/

+

+

+extern char *__glXcombine_strings(const char *, const char *);

+

+extern void __glXDisp_DrawArrays(GLbyte*);

+extern void __glXDispSwap_DrawArrays(GLbyte*);

+

+

+/*

+** Routines for sending swapped replies.

+*/

+

+extern void __glXSwapMakeCurrentReply(ClientPtr client,  

+                                      xGLXMakeCurrentReadSGIReply *reply);

+

+extern void __glXSwapIsDirectReply(ClientPtr client,

+				   xGLXIsDirectReply *reply);

+extern void __glXSwapQueryVersionReply(ClientPtr client,

+				       xGLXQueryVersionReply *reply);

+extern void __glXSwapQueryContextInfoEXTReply(ClientPtr client,

+					      xGLXQueryContextInfoEXTReply *reply,

+					      int *buf);

+extern void glxSwapQueryExtensionsStringReply(ClientPtr client,

+				xGLXQueryExtensionsStringReply *reply, char *buf);

+extern void glxSwapQueryServerStringReply(ClientPtr client,

+				xGLXQueryServerStringReply *reply, char *buf);

+extern void __glXSwapQueryContextReply(ClientPtr client,

+                                xGLXQueryContextReply *reply, int *buf);

+extern void __glXSwapGetDrawableAttributesReply(ClientPtr client,

+                             xGLXGetDrawableAttributesReply *reply, int *buf);

+extern void __glXSwapQueryMaxSwapBarriersSGIXReply(ClientPtr client,

+				   xGLXQueryMaxSwapBarriersSGIXReply *reply);

+

+/*

+ * Routines for computing the size of variably-sized rendering commands.

+ */

+

+extern int __glXTypeSize(GLenum enm);

+extern int __glXImageSize(GLenum format, GLenum type, GLsizei w, GLsizei h,

+			  GLint rowLength, GLint skipRows, GLint alignment);

+extern int __glXImage3DSize(GLenum format, GLenum type,

+			    GLsizei w, GLsizei h, GLsizei d,

+			    GLint imageHeight, GLint rowLength,

+			    GLint skipImages, GLint skipRows,

+			    GLint alignment);

+

+extern int __glXCallListsReqSize(GLbyte *pc, Bool swap);

+extern int __glXBitmapReqSize(GLbyte *pc, Bool swap);

+extern int __glXFogfvReqSize(GLbyte *pc, Bool swap);

+extern int __glXFogivReqSize(GLbyte *pc, Bool swap);

+extern int __glXLightfvReqSize(GLbyte *pc, Bool swap);

+extern int __glXLightivReqSize(GLbyte *pc, Bool swap);

+extern int __glXLightModelfvReqSize(GLbyte *pc, Bool swap);

+extern int __glXLightModelivReqSize(GLbyte *pc, Bool swap);

+extern int __glXMaterialfvReqSize(GLbyte *pc, Bool swap);

+extern int __glXMaterialivReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexParameterfvReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexParameterivReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexImage1DReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexImage2DReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexEnvfvReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexEnvivReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexGendvReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexGenfvReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexGenivReqSize(GLbyte *pc, Bool swap);

+extern int __glXMap1dReqSize(GLbyte *pc, Bool swap);

+extern int __glXMap1fReqSize(GLbyte *pc, Bool swap);

+extern int __glXMap2dReqSize(GLbyte *pc, Bool swap);

+extern int __glXMap2fReqSize(GLbyte *pc, Bool swap);

+extern int __glXPixelMapfvReqSize(GLbyte *pc, Bool swap);

+extern int __glXPixelMapuivReqSize(GLbyte *pc, Bool swap);

+extern int __glXPixelMapusvReqSize(GLbyte *pc, Bool swap);

+extern int __glXDrawPixelsReqSize(GLbyte *pc, Bool swap);

+extern int __glXDrawArraysSize(GLbyte *pc, Bool swap);

+extern int __glXPrioritizeTexturesReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexSubImage1DReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexSubImage2DReqSize(GLbyte *pc, Bool swap);

+extern int __glXTexImage3DReqSize(GLbyte *pc, Bool swap );

+extern int __glXTexSubImage3DReqSize(GLbyte *pc, Bool swap);

+extern int __glXConvolutionFilter1DReqSize(GLbyte *pc, Bool swap);

+extern int __glXConvolutionFilter2DReqSize(GLbyte *pc, Bool swap);

+extern int __glXConvolutionParameterivReqSize(GLbyte *pc, Bool swap);

+extern int __glXConvolutionParameterfvReqSize(GLbyte *pc, Bool swap);

+extern int __glXSeparableFilter2DReqSize(GLbyte *pc, Bool swap);

+extern int __glXColorTableReqSize(GLbyte *pc, Bool swap);

+extern int __glXColorSubTableReqSize(GLbyte *pc, Bool swap);

+extern int __glXColorTableParameterfvReqSize(GLbyte *pc, Bool swap);

+extern int __glXColorTableParameterivReqSize(GLbyte *pc, Bool swap);

+

+/*

+ * Routines for computing the size of returned data.

+ */

+extern int __glXConvolutionParameterivSize(GLenum pname);

+extern int __glXConvolutionParameterfvSize(GLenum pname);

+extern int __glXColorTableParameterfvSize(GLenum pname);

+extern int __glXColorTableParameterivSize(GLenum pname);

+

+extern void __glXFreeGLXWindow(__glXWindow *pGlxWindow);

+extern void __glXFreeGLXPbuffer(__glXPbuffer *pGlxPbuffer);

+

+extern int __glXVersionMajor;

+extern int __glXVersionMinor;

+

+#define __GLX_IS_VERSION_SUPPORTED(major,minor) \

+         ( (__glXVersionMajor > (major)) || \

+           ((__glXVersionMajor == (major)) && (__glXVersionMinor >= (minor))) )

+

+#endif /* !__GLX_server_h__ */

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index 7880a41af..bd8421713 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -1755,6 +1755,7 @@ xf86RandR12EnterVT (int screen_index, int flags)
     XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);

     rrScrPrivPtr     rp = rrGetScrPriv(pScreen);

     Bool	     ret;

+    int              i;

 

     if (randrp->orig_EnterVT) {

 	pScrn->EnterVT = randrp->orig_EnterVT;

@@ -1766,7 +1767,6 @@ xf86RandR12EnterVT (int screen_index, int flags)
     }

 

     /* reload gamma */

-    int i;

     for (i = 0; i < rp->numCrtcs; i++)

 	xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);

 

diff --git a/xorg-server/hw/xfree86/parser/Pointer.c b/xorg-server/hw/xfree86/parser/Pointer.c
index 5e4db442e..a7ee3f213 100644
--- a/xorg-server/hw/xfree86/parser/Pointer.c
+++ b/xorg-server/hw/xfree86/parser/Pointer.c
@@ -189,7 +189,7 @@ xf86parsePointerSection (void)
 				if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) {

 					Error (ZAXISMAPPING_MSG, NULL);

 				}

-				if (asprintf(&s, "%ul %ul", val1, val.num) == -1)

+				if (asprintf(&s, "%lu %u", val1, val.num) == -1)

 				    s = NULL;

 				break;

 			case XAXIS:

diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c
index 3edf25d24..b7ee109ed 100644
--- a/xorg-server/hw/xquartz/GL/indirect.c
+++ b/xorg-server/hw/xquartz/GL/indirect.c
@@ -174,7 +174,6 @@ static __GLXdrawable * __glXAquaScreenCreateDrawable(ClientPtr client, __GLXscre
 static void __glXAquaContextDestroy(__GLXcontext *baseContext);

 static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext);

 static int __glXAquaContextLoseCurrent(__GLXcontext *baseContext);

-static int __glXAquaContextForceCurrent(__GLXcontext *baseContext);

 static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, unsigned long mask);

 

 static CGLPixelFormatObj makeFormat(__GLXconfig *conf);

@@ -235,7 +234,6 @@ __glXAquaScreenCreateContext(__GLXscreen *screen,
     context->base.makeCurrent    = __glXAquaContextMakeCurrent;

     context->base.loseCurrent    = __glXAquaContextLoseCurrent;

     context->base.copy           = __glXAquaContextCopy;

-    context->base.forceCurrent   = __glXAquaContextForceCurrent;

     /*FIXME verify that the context->base is fully initialized. */

     

     context->pixelFormat = makeFormat(conf);

@@ -458,19 +456,6 @@ static int __glXAquaContextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc, un
     return gl_err == 0;

 }

 

-static int __glXAquaContextForceCurrent(__GLXcontext *baseContext)

-{

-    CGLError gl_err;

-    __GLXAquaContext *context = (__GLXAquaContext *) baseContext;

-    GLAQUA_DEBUG_MSG("glAquaForceCurrent (ctx %p)\n", context->ctx);

-

-    gl_err = CGLSetCurrentContext(context->ctx);

-    if (gl_err != 0)

-        ErrorF("CGLSetCurrentContext error: %s\n", CGLErrorString(gl_err));

-

-    return gl_err == 0;

-}

-

 /* Drawing surface notification callbacks */

 static GLboolean __glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base) {

     CGLError err;

@@ -681,17 +666,8 @@ GLuint __glFloorLog2(GLuint val)
     return c;

 }

 

-void warn_func(void * p1, char *format, ...) {

-    va_list v;

-    va_start(v, format);

-    vfprintf(stderr, format, v);

-    va_end(v);

-}

-

 static void setup_dispatch_table(void) {

     struct _glapi_table *disp=_glapi_get_dispatch();

-    _glapi_set_warning_func((_glapi_warning_func)warn_func);

-    _glapi_noop_enable_warnings(TRUE);

 

     /* to update:

      * for f in $(grep 'define SET_' ../../../glx/dispatch.h  | cut -f2 -d' ' | cut -f1 -d\( | sort -u); do grep -q $f indirect.c || echo $f ; done | grep -v by_offset | sed 's:SET_\(.*\)$:SET_\1(disp, gl\1)\;:' | pbcopy

diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 84d4a34c6..b73200569 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -96,7 +96,7 @@ typedef struct __GLXWinScreen glxWinScreen;
 typedef struct __GLXWinConfig GLXWinConfig;

 

 struct __GLXWinContext {

-  glx_context base;

+  __GLXcontext base;

   HGLRC ctx;                         /* Windows GL Context */

   HDC hDC;                           /* Windows device context */

   HDC hreadDC;                     /* Windows device read context */

@@ -415,9 +415,9 @@ fbConfigsDump(unsigned int n, __GLXconfig *c)
  */

 

 static __GLXscreen *glxWinScreenProbe(ScreenPtr pScreen);

-static glx_context *glxWinCreateContext(__GLXscreen *screen,

+static __GLXcontext *glxWinCreateContext(__GLXscreen *screen,

                                         __GLXconfig *modes,

-                                        glx_context *baseShareContext);

+                                        __GLXcontext *baseShareContext);

 static __GLXdrawable *glxWinCreateDrawable(ClientPtr client,

                                           __GLXscreen *screen,

                                           DrawablePtr pDraw,

@@ -1013,7 +1013,7 @@ glxWinDrawableDestroy(__GLXdrawable *base)
       // on the next context change)

       // (GLX core considers it an error when we try to select a new current context if the old one

       // has unflushed commands, but the window has disappeared..)

-      __GLX_NOTE_FLUSHED_CMDS(__glXLastContext);

+      __glXLastContext->hasUnflushedCommands = FALSE;

       __glXLastContext = NULL;

     }

 

@@ -1086,7 +1086,7 @@ glxWinCreateDrawable(ClientPtr client,
  */

 

 static

-int glxWinBindTexImage(glx_context  *baseContext,

+int glxWinBindTexImage(__GLXcontext  *baseContext,

                       int            buffer,

                       __GLXdrawable *pixmap)

 {

@@ -1095,7 +1095,7 @@ int glxWinBindTexImage(glx_context  *baseContext,
 }

 

 static

-int glxWinReleaseTexImage(glx_context  *baseContext,

+int glxWinReleaseTexImage(__GLXcontext  *baseContext,

                          int            buffer,

                          __GLXdrawable *pixmap)

 {

@@ -1566,7 +1566,7 @@ glxWinDeferredCreateContext(__GLXWinContext *gc, __GLXWinDrawable *draw)
 

 /* Context manipulation routines should return TRUE on success, FALSE on failure */

 static int

-glxWinContextMakeCurrent(glx_context *base)

+glxWinContextMakeCurrent(__GLXcontext *base)

 {

   __GLXWinContext *gc = (__GLXWinContext *)base;

   BOOL ret;

@@ -1641,7 +1641,7 @@ glxWinContextMakeCurrent(glx_context *base)
 }

 

 static int

-glxWinContextLoseCurrent(glx_context *base)

+glxWinContextLoseCurrent(__GLXcontext *base)

 {

   BOOL ret=TRUE;

   __GLXWinContext *gc = (__GLXWinContext *)base;

@@ -1670,7 +1670,7 @@ glxWinContextLoseCurrent(glx_context *base)
 }

 

 static int

-glxWinContextCopy(glx_context *dst_base, glx_context *src_base, unsigned long mask)

+glxWinContextCopy(__GLXcontext *dst_base, __GLXcontext *src_base, unsigned long mask)

 {

   __GLXWinContext *dst = (__GLXWinContext *)dst_base;

   __GLXWinContext *src = (__GLXWinContext *)src_base;

@@ -1687,15 +1687,8 @@ glxWinContextCopy(glx_context *dst_base, glx_context *src_base, unsigned long ma
   return ret;

 }

 

-static int

-glxWinContextForceCurrent(glx_context *base)

-{

-  /* wglMakeCurrent always flushes the previous context, so this is equivalent to glxWinContextMakeCurrent */

-  return glxWinContextMakeCurrent(base);

-}

-

 static void

-glxWinContextDestroy(glx_context *base)

+glxWinContextDestroy(__GLXcontext *base)

 {

   __GLXWinContext *gc = (__GLXWinContext *)base;

 

@@ -1726,10 +1719,10 @@ glxWinContextDestroy(glx_context *base)
     }

 }

 

-static glx_context *

+static __GLXcontext *

 glxWinCreateContext(__GLXscreen *screen,

                    __GLXconfig *modes,

-                   glx_context *baseShareContext)

+                   __GLXcontext *baseShareContext)

 {

     __GLXWinContext *context;

     __GLXWinContext *shareContext = (__GLXWinContext *)baseShareContext;

@@ -1750,7 +1743,6 @@ glxWinCreateContext(__GLXscreen *screen,
     context->base.makeCurrent    = glxWinContextMakeCurrent;

     context->base.loseCurrent    = glxWinContextLoseCurrent;

     context->base.copy           = glxWinContextCopy;

-    context->base.forceCurrent   = glxWinContextForceCurrent;

     context->base.textureFromPixmap = &glxWinTextureFromPixmap;

     context->base.config = modes;

     context->base.pGlxScreen = screen;