Flush DMA after clear and in a few more places. Fixes 'missing' software fallbacks.

2 files changed, 5 insertions, 3 deletions

diff --git a/xc/lib/GL/mesa/src/drv/savage/savageioctl.c b/xc/lib/GL/mesa/src/drv/savage/savageioctl.c
index 3e960962c..98b9d2029 100755
--- a/xc/lib/GL/mesa/src/drv/savage/savageioctl.c
+++ b/xc/lib/GL/mesa/src/drv/savage/savageioctl.c
@@ -156,8 +156,9 @@ static void savage_BCI_clear(GLcontext *ctx, drm_savage_clear_t *pclear)
 			}
 		}
 	}
-	
-
+	/* FK: Make sure that the clear stuff is emitted. Otherwise a
+	   software fallback may get overwritten by a delayed clear. */
+	savageDMAFlush (imesa);
 }
 
 struct timeb a,b;
diff --git a/xc/lib/GL/mesa/src/drv/savage/savageioctl.h b/xc/lib/GL/mesa/src/drv/savage/savageioctl.h
index 2859a64a5..08a8d6cf9 100755
--- a/xc/lib/GL/mesa/src/drv/savage/savageioctl.h
+++ b/xc/lib/GL/mesa/src/drv/savage/savageioctl.h
@@ -27,6 +27,7 @@
 #define SAVAGE_IOCTL_H
 
 #include "savagecontext.h"
+#include "savagedma.h"
 
 void savageGetGeneralDmaBufferLocked( savageContextPtr mmesa ); 
 
@@ -53,6 +54,6 @@ GLuint savageGetPhyAddress(savageContextPtr imesa,void * pointer);
 int  savageFreeDMABuffer(savageContextPtr, drm_savage_alloc_cont_mem_t*);
 #endif
 
-#define FLUSH_BATCH(imesa) /* noop */
+#define FLUSH_BATCH(imesa) savageDMAFlush(imesa)
 #endif