Rename GLvisual and __GLcontextModes to struct gl_config

5 files changed, 7 insertions, 7 deletions

diff --git a/src/mesa/drivers/dri/mach64/mach64_context.c b/src/mesa/drivers/dri/mach64/mach64_context.c
index a20a1c9655b..9d89cb8a486 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.c
+++ b/src/mesa/drivers/dri/mach64/mach64_context.c
@@ -86,7 +86,7 @@ static const struct dri_extension card_extensions[] =
 /* Create the device specific context.
   */
 GLboolean mach64CreateContext( gl_api api,
-			       const __GLcontextModes *glVisual,
+			       const struct gl_config *glVisual,
 			       __DRIcontext *driContextPriv,
                                void *sharedContextPrivate )
 {
diff --git a/src/mesa/drivers/dri/mach64/mach64_context.h b/src/mesa/drivers/dri/mach64/mach64_context.h
index 893fc8daee9..3d7943db01b 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.h
+++ b/src/mesa/drivers/dri/mach64/mach64_context.h
@@ -274,7 +274,7 @@ struct mach64_context {
 
 
 extern GLboolean mach64CreateContext( gl_api api,
-				      const __GLcontextModes *glVisual,
+				      const struct gl_config *glVisual,
 				      __DRIcontext *driContextPriv,
                                       void *sharedContextPrivate );
 
diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c
index 239e8bc8fd0..762ffe5e430 100644
--- a/src/mesa/drivers/dri/mach64/mach64_screen.c
+++ b/src/mesa/drivers/dri/mach64/mach64_screen.c
@@ -71,7 +71,7 @@ mach64FillInModes( __DRIscreen *psp,
 		   unsigned stencil_bits, GLboolean have_back_buffer )
 {
     __DRIconfig **configs;
-    __GLcontextModes * m;
+    struct gl_config * m;
     GLenum fb_format;
     GLenum fb_type;
     unsigned depth_buffer_factor;
@@ -298,7 +298,7 @@ mach64DestroyScreen( __DRIscreen *driScreen )
 static GLboolean
 mach64CreateBuffer( __DRIscreen *driScrnPriv,
 		    __DRIdrawable *driDrawPriv,
-		    const __GLcontextModes *mesaVis,
+		    const struct gl_config *mesaVis,
 		    GLboolean isPixmap )
 {
    mach64ScreenPtr screen = (mach64ScreenPtr) driScrnPriv->private;
@@ -414,7 +414,7 @@ mach64InitDriver( __DRIscreen *driScreen )
  * 
  * \todo maybe fold this into intelInitDriver
  *
- * \return the __GLcontextModes supported by this driver
+ * \return the struct gl_config supported by this driver
  */
 static const __DRIconfig **
 mach64InitScreen(__DRIscreen *psp)
diff --git a/src/mesa/drivers/dri/mach64/mach64_span.c b/src/mesa/drivers/dri/mach64/mach64_span.c
index 0c52c0c88cb..aff938debf7 100644
--- a/src/mesa/drivers/dri/mach64/mach64_span.c
+++ b/src/mesa/drivers/dri/mach64/mach64_span.c
@@ -154,7 +154,7 @@ void mach64DDInitSpanFuncs( GLcontext *ctx )
  * Plug in the Get/Put routines for the given driRenderbuffer.
  */
 void
-mach64SetSpanFunctions(driRenderbuffer *drb, const GLvisual *vis)
+mach64SetSpanFunctions(driRenderbuffer *drb, const struct gl_config *vis)
 {
    if (drb->Base.Format == MESA_FORMAT_RGB565) {
       mach64InitPointers_RGB565(&drb->Base);
diff --git a/src/mesa/drivers/dri/mach64/mach64_span.h b/src/mesa/drivers/dri/mach64/mach64_span.h
index 65141d05c3d..c0120ce9b03 100644
--- a/src/mesa/drivers/dri/mach64/mach64_span.h
+++ b/src/mesa/drivers/dri/mach64/mach64_span.h
@@ -36,6 +36,6 @@
 extern void mach64DDInitSpanFuncs( GLcontext *ctx );
 
 extern void
-mach64SetSpanFunctions(driRenderbuffer *rb, const GLvisual *vis);
+mach64SetSpanFunctions(driRenderbuffer *rb, const struct gl_config *vis);
 
 #endif