Merge remote branch 'origin/mesa_7_6_branch'

[mesa.git] / src / mesa / drivers / dri / r600 / r700_ioctl.c

diff --git a/src/mesa/drivers/dri/r600/r700_ioctl.c b/src/mesa/drivers/dri/r600/r700_ioctl.c
index 7493efab0feedd01423f82ae72e1bd8ffc6eba09..72a8978976718ada78274b0d4a01bc5e8f7d1b00 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_ioctl.c
+++ b/src/mesa/drivers/dri/r600/r700_ioctl.c
@@ -31,44 +31,20 @@
 #include "main/imports.h"
 #include "main/macros.h"
 #include "main/context.h"
+#include "main/simple_list.h"
 #include "swrast/swrast.h"
 
 #include "radeon_common.h"
 #include "radeon_lock.h"
 #include "r600_context.h"
 
-#include "r700_chip.h"
 #include "r700_ioctl.h"
 #include "r700_clear.h"
 
-static void r700Flush(GLcontext *ctx)
-{
-       radeonContextPtr radeon = RADEON_CONTEXT(ctx);
-    context_t *     context = R700_CONTEXT(ctx);
-
-       if (RADEON_DEBUG & DEBUG_IOCTL)
-               fprintf(stderr, "%s %d\n", __FUNCTION__, radeon->cmdbuf.cs->cdw);
-
-       /* okay if we have no cmds in the buffer &&
-          we have no DMA flush &&
-          we have no DMA buffer allocated.
-          then no point flushing anything at all.
-       */
-       if (!radeon->dma.flush && !radeon->cmdbuf.cs->cdw && !radeon->dma.current)
-               return;
-
-       if (radeon->dma.flush)
-               radeon->dma.flush( ctx );
-
-       r700SendContextStates(context, NULL, NULL);
-   
-       if (radeon->cmdbuf.cs->cdw)
-               rcommonFlushCmdBuf(radeon, __FUNCTION__);
-}
 
 void r700InitIoctlFuncs(struct dd_function_table *functions)
 {
        functions->Clear = r700Clear;
        functions->Finish = radeonFinish;
-       functions->Flush = r700Flush;
+       functions->Flush = radeonFlush;
 }