Mesa (radeon-rewrite): r300: drop r300Flush for the generic one

[Dave Airlie]

Module: Mesa
Branch: radeon-rewrite
Commit: 199867bd4585036f19e219562c22a9b499a7b0d2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=199867bd4585036f19e219562c22a9b499a7b0d2

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Feb 25 18:06:44 2009 +1000

r300: drop r300Flush for the generic one

---

 src/mesa/drivers/dri/r300/r300_ioctl.c    |   18 +-----------------
 src/mesa/drivers/dri/r300/r300_ioctl.h    |    7 -------
 src/mesa/drivers/dri/r300/r300_texstate.c |    2 +-
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 90b85f0..5e3e529 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -612,25 +612,9 @@ static void r300Clear(GLcontext * ctx, GLbitfield mask)
 	COMMIT_BATCH();
 }
 
-void r300Flush(GLcontext * ctx)
-{
-	r300ContextPtr rmesa = R300_CONTEXT(ctx);
-
-	if (RADEON_DEBUG & DEBUG_IOCTL)
-		fprintf(stderr, "%s\n", __FUNCTION__);
-
-	if (rmesa->radeon.dma.flush) {
-		rmesa->radeon.dma.flush(ctx);
-	}
-	
-	if (rmesa->radeon.cmdbuf.cs->cdw) {
-		rcommonFlushCmdBuf(&rmesa->radeon, __FUNCTION__);
-	}
-}
-
 void r300InitIoctlFuncs(struct dd_function_table *functions)
 {
 	functions->Clear = r300Clear;
 	functions->Finish = radeonFinish;
-	functions->Flush = r300Flush;
+	functions->Flush = radeonFlush;
 }
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.h b/src/mesa/drivers/dri/r300/r300_ioctl.h
index 5f00264..3abfa71 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.h
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.h
@@ -39,13 +39,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r300_context.h"
 #include "radeon_drm.h"
 
-extern void r300Flush(GLcontext * ctx);
-
-extern void r300AllocDmaRegion(r300ContextPtr rmesa,
-			       struct radeon_bo **pbo, int *poffset,
-			       int bytes, int alignment);
-
 extern void r300InitIoctlFuncs(struct dd_function_table *functions);
 
-extern void r300RefillCurrentDmaRegion(r300ContextPtr rmesa, int size);
 #endif				/* __R300_IOCTL_H__ */
diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index ef13fed..f5b4118 100644
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -330,7 +330,7 @@ again:
 	if (ret == RADEON_CS_SPACE_OP_TO_BIG)
 		return GL_FALSE;
 	if (ret == RADEON_CS_SPACE_FLUSH) {
-		r300Flush(ctx);
+		radeonFlush(ctx);
 		if (flushed)
 			return GL_FALSE;
 		flushed = 1;