dri/nouveau: Don't reemit the BO state in nouveau_state_emit().

2010-09-15 16:44:06 +02:00
parent bfc7518ab9
commit d4d81ed02e
2 changed files with 3 additions and 5 deletions
@@ -459,8 +459,6 @@ nouveau_state_emit(GLcontext *ctx)
 	}

 	BITSET_ZERO(nctx->dirty);
-
-	nouveau_bo_state_emit(ctx);
 }

 static void
@@ -93,15 +93,15 @@ nv04_channel_flush_notify(struct nouveau_channel *chan)
 	GLcontext *ctx = &nctx->base;

 	if (nctx->fallback < SWRAST) {
-		/* Flushing seems to clobber the engine context. */
+		nouveau_bo_state_emit(ctx);
+
+		/* Reemit the engine state. */
 		context_emit(ctx, TEX_OBJ0);
 		context_emit(ctx, TEX_OBJ1);
 		context_emit(ctx, TEX_ENV0);
 		context_emit(ctx, TEX_ENV1);
 		context_emit(ctx, CONTROL);
 		context_emit(ctx, BLEND);
-
-		nouveau_bo_state_emit(ctx);
 	}
 }