r200: use correct finish interface

diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
index cb1bd8be9563065bba237968d9f614afbe0fd7ae..6317decf6418986d1863f88e57559c476fddab1a 100644 (file)
--- 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 e19ff44bc8e6cded9ab9a16aa2f1ce54c9c3eb89..c08968f7f866aa6ddae7a9797956d68c3c1efdba 100644 (file)
--- 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 950478e762e3b854132b9871bb291c122ce11cf2..2a4b8a11f4c8850b99df87fb40e88637fa498436 100644 (file)
--- 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 eefa2a1e11aef11c6574cf4f9cb36870265dd29e..a6c655866ac4bfb2a2ec49d5e47962cee57b5fd7 100644 (file)
--- 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 559985bc3fb8498b1cbad43dbbfad8fd0298fc34..126f78b39ca67547038a52f7118bd4177245f9a4 100644 (file)
--- 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;