replace IntelFlush(), FLUSH_VERTICES(), etc. with st_flush() call

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index dc6a02999ee8d9984698142128455a23cc9d2bf0..b0c1a608fa84d5266dfeb7169d95396a031b5824 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -147,20 +147,6 @@ static const struct dri_debug_control debug_control[] = {
 #endif
 
 
-void
-intelFlush(GLcontext * ctx)
-{
-   struct intel_context *intel = intel_context(ctx);
-
-   /* Hmm:
-    */
-   intel->pipe->flush( intel->pipe, 0 );
-}
-
-
-
-
-
 static void
 intelInitDriverFunctions(struct dd_function_table *functions)
 {
@@ -344,11 +330,7 @@ GLboolean
 intelUnbindContext(__DRIcontextPrivate * driContextPriv)
 {
    struct intel_context *intel = (struct intel_context *) driContextPriv->driverPrivate;
-   /* XXX UnbindContext is called AFTER the new context is made current.
-      Hopefully shouldn't be a problem ? */
-   GLcontext *ctx = intel->st->ctx;
-   FLUSH_VERTICES(ctx, 0);
-   intelFlush(ctx);
+   st_flush(intel->st);
    return GL_TRUE;
 }
 

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index 762335a0046bb3cd38bd3732ab68775edcd76cb7..788d444d00220099118e7e02eaf48b00b6327a47 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -139,12 +139,6 @@ extern int __intel_debug;
 #define PCI_CHIP_Q33_G                 0x29D2
 
 
-/* ================================================================
- * intel_context.c:
- */
-
-extern void intelFlush(GLcontext * ctx);
-
 /*======================================================================
  * Inline conversion functions.  
  * These are better-typed than the macros used previously:

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
index 986a6f71127fab52b1abaabffae3558d36311ad8..7629a0fe293a29c3ba78292125b8ba3f0f3551e1 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
@@ -417,7 +417,7 @@ intelPageFlip(const __DRIdrawablePrivate * dPriv)
    if (intel->intelScreen->drmMinor < 9)
       return GL_FALSE;
 
-   intelFlush(&intel->ctx);
+   st_flush(intel->st);
 
    ret = 0;