Rename GLvisual and __GLcontextModes to struct gl_config

9 files changed, 11 insertions, 11 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 1c7f600d2b..fed0b7a34f 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -77,7 +77,7 @@ nouveau_channel_flush_notify(struct nouveau_channel *chan)
 
 GLboolean
 nouveau_context_create(gl_api api,
-		       const __GLcontextModes *visual, __DRIcontext *dri_ctx,
+		       const struct gl_config *visual, __DRIcontext *dri_ctx,
 		       void *share_ctx)
 {
 	__DRIscreen *dri_screen = dri_ctx->driScreenPriv;
@@ -98,7 +98,7 @@ nouveau_context_create(gl_api api,
 
 GLboolean
 nouveau_context_init(GLcontext *ctx, struct nouveau_screen *screen,
-		     const GLvisual *visual, GLcontext *share_ctx)
+		     const struct gl_config *visual, GLcontext *share_ctx)
 {
 	struct nouveau_context *nctx = to_nouveau_context(ctx);
 	struct dd_function_table functions;
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h
index 5f00327119..8cbfefe85a 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h
@@ -95,12 +95,12 @@ struct nouveau_context {
 
 GLboolean
 nouveau_context_create(gl_api api,
-		       const __GLcontextModes *visual, __DRIcontext *dri_ctx,
+		       const struct gl_config *visual, __DRIcontext *dri_ctx,
 		       void *share_ctx);
 
 GLboolean
 nouveau_context_init(GLcontext *ctx, struct nouveau_screen *screen,
-		     const GLvisual *visual, GLcontext *share_ctx);
+		     const struct gl_config *visual, GLcontext *share_ctx);
 
 void
 nouveau_context_deinit(GLcontext *ctx);
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
index 283f6eac2c..fa2bc7abd1 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
@@ -52,7 +52,7 @@
 
 struct nouveau_driver {
 	GLcontext *(*context_create)(struct nouveau_screen *screen,
-				     const GLvisual *visual,
+				     const struct gl_config *visual,
 				     GLcontext *share_ctx);
 	void (*context_destroy)(GLcontext *ctx);
 
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
index f0caf4c629..397d4ad1eb 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
@@ -180,7 +180,7 @@ nouveau_framebuffer_new(GLcontext *ctx, GLuint name)
 }
 
 struct gl_framebuffer *
-nouveau_framebuffer_dri_new(const GLvisual *visual)
+nouveau_framebuffer_dri_new(const struct gl_config *visual)
 {
 	struct nouveau_framebuffer *nfb;
 
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.h b/src/mesa/drivers/dri/nouveau/nouveau_fbo.h
index 05ea03a075..b1d5d8da45 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.h
@@ -45,7 +45,7 @@ struct nouveau_renderbuffer {
 #define to_nouveau_renderbuffer(x) ((struct nouveau_renderbuffer *)(x))
 
 struct gl_framebuffer *
-nouveau_framebuffer_dri_new(const GLvisual *visual);
+nouveau_framebuffer_dri_new(const struct gl_config *visual);
 
 struct gl_renderbuffer *
 nouveau_renderbuffer_dri_new(GLenum format, __DRIdrawable *drawable);
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 4330c8d947..a6e2186cf4 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -153,7 +153,7 @@ nouveau_destroy_screen(__DRIscreen *dri_screen)
 static GLboolean
 nouveau_create_buffer(__DRIscreen *dri_screen,
 		      __DRIdrawable *drawable,
-		      const __GLcontextModes *visual,
+		      const struct gl_config *visual,
 		      GLboolean is_pixmap)
 {
 	struct gl_renderbuffer *rb;
diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.c b/src/mesa/drivers/dri/nouveau/nv04_context.c
index 94422f559d..9906cac07a 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_context.c
@@ -167,7 +167,7 @@ nv04_context_destroy(GLcontext *ctx)
 }
 
 static GLcontext *
-nv04_context_create(struct nouveau_screen *screen, const GLvisual *visual,
+nv04_context_create(struct nouveau_screen *screen, const struct gl_config *visual,
 		    GLcontext *share_ctx)
 {
 	struct nv04_context *nctx;
diff --git a/src/mesa/drivers/dri/nouveau/nv10_context.c b/src/mesa/drivers/dri/nouveau/nv10_context.c
index 3d898fd94d..04b0fc37a8 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_context.c
@@ -416,7 +416,7 @@ nv10_context_destroy(GLcontext *ctx)
 }
 
 static GLcontext *
-nv10_context_create(struct nouveau_screen *screen, const GLvisual *visual,
+nv10_context_create(struct nouveau_screen *screen, const struct gl_config *visual,
 		    GLcontext *share_ctx)
 {
 	struct nouveau_context *nctx;
diff --git a/src/mesa/drivers/dri/nouveau/nv20_context.c b/src/mesa/drivers/dri/nouveau/nv20_context.c
index b9c221e716..bc424f8b28 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_context.c
@@ -385,7 +385,7 @@ nv20_context_destroy(GLcontext *ctx)
 }
 
 static GLcontext *
-nv20_context_create(struct nouveau_screen *screen, const GLvisual *visual,
+nv20_context_create(struct nouveau_screen *screen, const struct gl_config *visual,
 		    GLcontext *share_ctx)
 {
 	struct nouveau_context *nctx;