remove INTEL_FIREVERTICES

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 5433ae484255d3b0f6dfed66b8f43cae01b15133..3898d2e4af1f2545640a7229a49a41197e76086e 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -290,7 +290,7 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
    if (intel) {
       GLboolean release_texture_heaps;
 
-      INTEL_FIREVERTICES(intel);
+      st_flush(intel->st);
 
       //intel->vtbl.destroy(intel);
 

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index e9c14b6a5b429d55cf97fb3e3c7c8faea3dd1549..efaf22e2f1df725ff63aae7311f7b1e07385c22a 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -91,9 +91,6 @@ void UNLOCK_HARDWARE( struct intel_context *intel );
 
 extern char *__progname;
 
-/* Will become a call into state_tracker:
- */
-#define INTEL_FIREVERTICES(intel)             
 
 
 /* ================================================================

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_lock.c b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
index 90ade2679cbddadb5c391e5e5a425e7d9311bf48..01d02f9a2ad374fa35464175c9ac1d0b89ab64b6 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_lock.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_lock.c
@@ -93,7 +93,7 @@ intelContendedLock(struct intel_context *intel, GLuint flags)
        */
       intel->numClipRects = 0;
 
-      INTEL_FIREVERTICES(intel);
+      st_flush(intel->st);
 
       if (intel->batch->map != intel->batch->ptr)
         intel_batchbuffer_flush(intel->batch);