Mesa (master): dri/nouveau: Cleanup more references to old FBOs and VBOs.

[Francisco Jerez]

Module: Mesa
Branch: master
Commit: 22c83ac47a50ed1fdab59476886a7e56910a653a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=22c83ac47a50ed1fdab59476886a7e56910a653a

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Fri Sep 17 16:35:49 2010 +0200

dri/nouveau: Cleanup more references to old FBOs and VBOs.

---

 src/mesa/drivers/dri/nouveau/nouveau_context.c |    7 +++----
 src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c   |    1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index eff1016..0fecdee 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -262,7 +262,10 @@ update_framebuffer(__DRIcontext *dri_ctx, __DRIdrawable *draw,
 	nouveau_update_renderbuffers(dri_ctx, draw);
 	_mesa_resize_framebuffer(ctx, fb, draw->w, draw->h);
 
+	/* Clean up references to the old framebuffer objects. */
 	context_dirty(ctx, FRAMEBUFFER);
+	context_bctx(ctx, FRAMEBUFFER);
+	FIRE_RING(context_chan(ctx));
 }
 
 GLboolean
@@ -283,10 +286,6 @@ nouveau_context_make_current(__DRIcontext *dri_ctx, __DRIdrawable *dri_draw,
 			update_framebuffer(dri_ctx, dri_read,
 					   &dri_ctx->dri2.read_stamp);
 
-		/* Clean up references to the old framebuffer objects. */
-		context_bctx(ctx, FRAMEBUFFER);
-		FIRE_RING(context_chan(ctx));
-
 		/* Pass it down to mesa. */
 		_mesa_make_current(ctx, dri_draw->driverPrivate,
 				   dri_read->driverPrivate);
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
index e5858f8..e4415cb 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
@@ -143,6 +143,7 @@ vbo_deinit_arrays(GLcontext *ctx, const struct _mesa_index_buffer *ib,
 	}
 
 	render->attr_count = 0;
+	context_bctx(ctx, VERTEX);
 }
 
 /* Make some rendering decisions from the GL context. */