From 6e963e965cd00d69de0d868882c2c5322b39f578 Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Thu, 25 Mar 2004 01:16:27 +0000 Subject: More state management changes: - Don't lock in savageDDUpdateStatte, don't call savageEmitHwStateLocked - Need to grab the lock for texture uploads now - New SAVAGE_NEW_CULL bit in new_state to make sure that culling state and raster_primitive are not examined at the wrong times. --- src/mesa/drivers/dri/savage/savagetris.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri/savage/savagetris.c') diff --git a/src/mesa/drivers/dri/savage/savagetris.c b/src/mesa/drivers/dri/savage/savagetris.c index 13772df9b3..6ed2b0f9b6 100644 --- a/src/mesa/drivers/dri/savage/savagetris.c +++ b/src/mesa/drivers/dri/savage/savagetris.c @@ -673,13 +673,13 @@ static void savageRasterPrimitive( GLcontext *ctx, GLuint prim ) { savageContextPtr imesa = SAVAGE_CONTEXT( ctx ); - FLUSH_BATCH(imesa); - /* Update culling */ - if (imesa->raster_primitive != prim) - imesa->dirty |= SAVAGE_UPLOAD_CTX; + if (imesa->raster_primitive != prim) { + imesa->raster_primitive = prim; + imesa->new_state |= SAVAGE_NEW_CULL; + savageDDUpdateHwState (ctx); + } - imesa->raster_primitive = prim; #if 0 if (ctx->Polygon.StippleFlag && mmesa->haveHwStipple) { -- cgit v1.2.3