r300: drop r300Flush for the generic one

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 90b85f0df75dd1613699545b534dfb69b86c4f5a..5e3e529bff6136a3f7ae38d2aaf95209eca1070c 100644 (file)
--- 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 5f00264f11250a7db3a95548974523b7fbb77202..3abfa71a6e80f183a0f36f2dec6197bb92311ca9 100644 (file)
--- 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 ef13fed6b22d10b157ce27c283a96cd6c3f61683..f5b41180f795d93d5f9aef45584dba25199e67d5 100644 (file)
--- 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;