From 393c699e219b6cccf0d235749ec7bfaade75f88c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 13 Feb 2009 00:04:11 +1000
Subject: r200: use correct finish interface

---
 src/mesa/drivers/dri/r200/r200_cmdbuf.c | 2 +-
 src/mesa/drivers/dri/r200/r200_ioctl.c  | 2 +-
 src/mesa/drivers/dri/r200/r200_ioctl.h  | 2 --
 src/mesa/drivers/dri/r200/r200_pixel.c  | 2 +-
 src/mesa/drivers/dri/r200/r200_state.c  | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
index cb1bd8be956..6317decf641 100644
--- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c
+++ b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
@@ -187,7 +187,7 @@ void r200FlushElts(GLcontext *ctx)
 
    if (R200_DEBUG & DEBUG_SYNC) {
       fprintf(stderr, "%s: Syncing\n", __FUNCTION__);
-      r200Finish( rmesa->radeon.glCtx );
+      radeonFinish( rmesa->radeon.glCtx );
    }
 }
 
diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c
index e19ff44bc8e..c08968f7f86 100644
--- a/src/mesa/drivers/dri/r200/r200_ioctl.c
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.c
@@ -213,7 +213,7 @@ static void r200Clear( GLcontext *ctx, GLbitfield mask )
 	 return;
    }
 
-   r200Flush( ctx );
+   radeonFlush( ctx );
 
    if ( mask & BUFFER_BIT_FRONT_LEFT ) {
       flags |= RADEON_FRONT;
diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h
index 950478e762e..2a4b8a11f4c 100644
--- a/src/mesa/drivers/dri/r200/r200_ioctl.h
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.h
@@ -61,8 +61,6 @@ extern GLushort *r200AllocEltsOpenEnded( r200ContextPtr rmesa,
 
 extern void r200EmitAOS(r200ContextPtr rmesa, GLuint nr, GLuint offset);
 
-extern void r200Flush( GLcontext *ctx );
-extern void r200Finish( GLcontext *ctx );
 extern void r200InitIoctlFuncs( struct dd_function_table *functions );
 
 extern void *r200AllocateMemoryMESA( __DRIscreen *screen, GLsizei size, GLfloat readfreq,
diff --git a/src/mesa/drivers/dri/r200/r200_pixel.c b/src/mesa/drivers/dri/r200/r200_pixel.c
index eefa2a1e11a..a6c655866ac 100644
--- a/src/mesa/drivers/dri/r200/r200_pixel.c
+++ b/src/mesa/drivers/dri/r200/r200_pixel.c
@@ -262,7 +262,7 @@ r200TryReadPixels( GLcontext *ctx,
    }
    UNLOCK_HARDWARE( &rmesa->radeon );
 
-   r200Finish( ctx ); /* required by GL */
+   radeonFinish( ctx ); /* required by GL */
 #endif
    return GL_TRUE;
 }
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index 559985bc3fb..126f78b39ca 100644
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -2380,7 +2380,7 @@ again:
    if (ret == RADEON_CS_SPACE_OP_TO_BIG)
       return GL_FALSE;
    if (ret == RADEON_CS_SPACE_FLUSH) {
-      r200Flush(ctx);
+      radeonFlush(ctx);
       if (flushed)
 	 return GL_FALSE;
       flushed = 1;
-- 
cgit v1.2.3