From 798658cc81ca0d0ecb6d5c0aa9539e4d0996ec6d Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 2 Nov 2007 12:48:39 -0600 Subject: [PATCH] remove INTEL_FIREVERTICES --- src/mesa/drivers/dri/intel_winsys/intel_context.c | 2 +- src/mesa/drivers/dri/intel_winsys/intel_context.h | 3 --- src/mesa/drivers/dri/intel_winsys/intel_lock.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c index 5433ae48425..3898d2e4af1 100644 --- 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 e9c14b6a5b4..efaf22e2f1d 100644 --- 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 90ade2679cb..01d02f9a2ad 100644 --- 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); -- 2.30.2