glx: Rename __GLXcontext and __GLXdisplayPrivate to struct types.

1 files changed, 39 insertions, 39 deletions

diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index bde454b3e16..4f5c02fc34d 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -67,16 +67,14 @@
 
 #define __GLX_MAX_TEXTURE_UNITS 32
 
-typedef struct __GLXcontextRec __GLXcontext;
-typedef struct __GLXdrawableRec __GLXdrawable;
-typedef struct __GLXdisplayPrivateRec __GLXdisplayPrivate;
-typedef struct _glapi_table __GLapi;
+struct glx_display;
+struct glx_context;
 
 /************************************************************************/
 
 #ifdef GLX_DIRECT_RENDERING
 
-extern void DRI_glXUseXFont(GLXContext CC,
+extern void DRI_glXUseXFont(struct glx_context *ctx,
 			    Font font, int first, int count, int listbase);
 
 #endif
@@ -101,16 +99,17 @@ struct __GLXDRIdisplayRec
      */
    void (*destroyDisplay) (__GLXDRIdisplay * display);
 
-   struct glx_screen *(*createScreen)(int screen, __GLXdisplayPrivate * priv);
+   struct glx_screen *(*createScreen)(int screen, struct glx_display * priv);
 };
 
 struct __GLXDRIscreenRec {
 
    void (*destroyScreen)(struct glx_screen *psc);
 
-   __GLXcontext *(*createContext)(struct glx_screen *psc,
-				  struct glx_config *config,
-				  GLXContext shareList, int renderType);
+   struct glx_context *(*createContext)(struct glx_screen *psc,
+					struct glx_config *config,
+					struct glx_context *shareList,
+					int renderType);
 
    __GLXDRIdrawable *(*createDrawable)(struct glx_screen *psc,
 				       XID drawable,
@@ -134,9 +133,9 @@ struct __GLXDRIscreenRec {
 
 struct __GLXDRIcontextRec
 {
-   Bool(*bindContext) (__GLXcontext *context, __GLXDRIdrawable *pdraw,
+   Bool(*bindContext) (struct glx_context *context, __GLXDRIdrawable *pdraw,
 		       __GLXDRIdrawable *pread);
-   void (*unbindContext) (__GLXcontext *context);
+   void (*unbindContext) (struct glx_context *context);
 };
 
 struct __GLXDRIdrawableRec
@@ -221,10 +220,10 @@ typedef struct __GLXattributeMachineRec
 } __GLXattributeMachine;
 
 struct glx_context_vtable {
-   void (*destroy)(__GLXcontext *ctx);
-   void (*wait_gl)(__GLXcontext *ctx);
-   void (*wait_x)(__GLXcontext *ctx);
-   void (*use_x_font)(__GLXcontext *ctx,
+   void (*destroy)(struct glx_context *ctx);
+   void (*wait_gl)(struct glx_context *ctx);
+   void (*wait_x)(struct glx_context *ctx);
+   void (*use_x_font)(struct glx_context *ctx,
 		      Font font, int first, int count, int listBase);
    void (*bind_tex_image)(Display * dpy,
 			  GLXDrawable drawable,
@@ -240,7 +239,7 @@ glx_send_destroy_context(Display *dpy, XID xid);
  * GLX state that needs to be kept on the client.  One of these records
  * exist for each context that has been made current by this client.
  */
-struct __GLXcontextRec
+struct glx_context
 {
     /**
      * \name Drawing command buffer.
@@ -326,7 +325,7 @@ struct __GLXcontextRec
      * Fill newImage with the unpacked form of \c oldImage getting it
      * ready for transport to the server.
      */
-   void (*fillImage) (__GLXcontext *, GLint, GLint, GLint, GLint, GLenum,
+   void (*fillImage) (struct glx_context *, GLint, GLint, GLint, GLint, GLenum,
                       GLenum, const GLvoid *, GLubyte *, GLubyte *);
 
     /**
@@ -443,7 +442,7 @@ struct __GLXcontextRec
 };
 
 extern Bool
-glx_context_init(__GLXcontext *gc,
+glx_context_init(struct glx_context *gc,
 		 struct glx_screen *psc, struct glx_config *fbconfig);
 
 #define __glXSetError(gc,code)  \
@@ -451,7 +450,7 @@ glx_context_init(__GLXcontext *gc,
       (gc)->error = code;       \
    }
 
-extern void __glFreeAttributeState(__GLXcontext *);
+extern void __glFreeAttributeState(struct glx_context *);
 
 /************************************************************************/
 
@@ -486,9 +485,10 @@ extern void __glFreeAttributeState(__GLXcontext *);
  * a pointer to the config data for that screen (if the screen supports GL).
  */
 struct glx_screen_vtable {
-   __GLXcontext *(*create_context)(struct glx_screen *psc,
-				   struct glx_config *config,
-				   GLXContext shareList, int renderType);
+   struct glx_context *(*create_context)(struct glx_screen *psc,
+					 struct glx_config *config,
+					 struct glx_context *shareList,
+					 int renderType);
 };
 
 struct glx_screen
@@ -506,7 +506,7 @@ struct glx_screen
      */
    char *effectiveGLXexts;
 
-   __GLXdisplayPrivate *display;
+   struct glx_display *display;
 
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
     /**
@@ -541,11 +541,11 @@ struct glx_screen
  * Per display private data.  One of these records exists for each display
  * that is using the OpenGL (GLX) extension.
  */
-struct __GLXdisplayPrivateRec
+struct glx_display
 {
    /* The extension protocol codes */
    XExtCodes *codes;
-   struct __GLXdisplayPrivateRec *next;
+   struct glx_display *next;
 
     /**
      * Back pointer to the display
@@ -599,24 +599,24 @@ struct __GLXdisplayPrivateRec
 
 extern int
 glx_screen_init(struct glx_screen *psc,
-		int screen, __GLXdisplayPrivate * priv);
+		int screen, struct glx_display * priv);
 
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
 extern __GLXDRIdrawable *
 dri2GetGlxDrawableFromXDrawableId(Display *dpy, XID id);
 #endif
 
-extern GLubyte *__glXFlushRenderBuffer(__GLXcontext *, GLubyte *);
+extern GLubyte *__glXFlushRenderBuffer(struct glx_context *, GLubyte *);
 
-extern void __glXSendLargeChunk(__GLXcontext * gc, GLint requestNumber,
+extern void __glXSendLargeChunk(struct glx_context * gc, GLint requestNumber,
                                 GLint totalRequests,
                                 const GLvoid * data, GLint dataLen);
 
-extern void __glXSendLargeCommand(__GLXcontext *, const GLvoid *, GLint,
+extern void __glXSendLargeCommand(struct glx_context *, const GLvoid *, GLint,
                                   const GLvoid *, GLint);
 
 /* Initialize the GLX extension for dpy */
-extern __GLXdisplayPrivate *__glXInitialize(Display *);
+extern struct glx_display *__glXInitialize(Display *);
 
 extern void __glXPreferEGL(int state);
 
@@ -627,7 +627,7 @@ extern int __glXDebug;
 /* This is per-thread storage in an MT environment */
 #if defined( PTHREADS )
 
-extern void __glXSetCurrentContext(__GLXcontext * c);
+extern void __glXSetCurrentContext(struct glx_context * c);
 
 # if defined( GLX_USE_TLS )
 
@@ -638,13 +638,13 @@ extern __thread void *__glX_tls_Context
 
 # else
 
-extern __GLXcontext *__glXGetCurrentContext(void);
+extern struct glx_context *__glXGetCurrentContext(void);
 
 # endif /* defined( GLX_USE_TLS ) */
 
 #else
 
-extern __GLXcontext *__glXcurrentContext;
+extern struct glx_context *__glXcurrentContext;
 #define __glXGetCurrentContext() __glXcurrentContext
 #define __glXSetCurrentContext(gc) __glXcurrentContext = gc
 
@@ -680,7 +680,7 @@ extern CARD8 __glXSetupForCommand(Display * dpy);
 extern const GLuint __glXDefaultPixelStore[9];
 
 /* Send an image to the server using RenderLarge. */
-extern void __glXSendLargeImage(__GLXcontext * gc, GLint compsize, GLint dim,
+extern void __glXSendLargeImage(struct glx_context * gc, GLint compsize, GLint dim,
                                 GLint width, GLint height, GLint depth,
                                 GLenum format, GLenum type,
                                 const GLvoid * src, GLubyte * pc,
@@ -704,7 +704,7 @@ extern GLint __glBytesPerElement(GLenum type);
 ** updated to contain the modes needed by the server to decode the
 ** sent data.
 */
-extern void __glFillImage(__GLXcontext *, GLint, GLint, GLint, GLint, GLenum,
+extern void __glFillImage(struct glx_context *, GLint, GLint, GLint, GLint, GLenum,
                           GLenum, const GLvoid *, GLubyte *, GLubyte *);
 
 /* Copy map data with a stride into a packed buffer */
@@ -719,15 +719,15 @@ extern void __glFillMap2d(GLint, GLint, GLint, GLint, GLint,
 ** Empty an image out of the reply buffer into the clients memory applying
 ** the pack modes to pack back into the clients requested format.
 */
-extern void __glEmptyImage(__GLXcontext *, GLint, GLint, GLint, GLint, GLenum,
+extern void __glEmptyImage(struct glx_context *, GLint, GLint, GLint, GLint, GLenum,
                            GLenum, const GLubyte *, GLvoid *);
 
 
 /*
 ** Allocate and Initialize Vertex Array client state, and free.
 */
-extern void __glXInitVertexArrayState(__GLXcontext *);
-extern void __glXFreeVertexArrayState(__GLXcontext *);
+extern void __glXInitVertexArrayState(struct glx_context *);
+extern void __glXFreeVertexArrayState(struct glx_context *);
 
 /*
 ** Inform the Server of the major and minor numbers and of the client
@@ -789,6 +789,6 @@ GetGLXDRIDrawable(Display *dpy, GLXDrawable drawable);
 #endif
 
 extern struct glx_screen *
-indirect_create_screen(int screen, __GLXdisplayPrivate * priv);
+indirect_create_screen(int screen, struct glx_display * priv);
 
 #endif /* !__GLX_client_h__ */