mesa: Branch 'master'

[matthieu castet]

 src/mesa/drivers/dri/nouveau/nv10_state.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree c7c0a6ddcddc8d91fde0a7cb5a2bce85c708d438 (from b0e86b2dbd11b3ff515172cf1741600c0879ad3f)
Author: Matthieu Castet <castet.matthieu at free.fr>
Date:   Sun Jan 28 23:26:21 2007 +0100

    nouveau : nv10 mixing cached stuff with not cached stuff is bad.

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 0e912e7..4e9bccb 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -688,10 +688,10 @@ static GLboolean nv10BindBuffers(nouveau
 	if (color[0]->mesa._ActualFormat != GL_RGBA8) {
 		format = 0x103; /* R5G6B5 color buffer */
 	}
-	OUT_RING(format);
-	OUT_RING(pitch);
-	OUT_RING(color[0]->offset);
-	OUT_RING(depth ? depth->offset : color[0]->offset);
+	OUT_RING_CACHE(format);
+	OUT_RING_CACHE(pitch);
+	OUT_RING_CACHE(color[0]->offset);
+	OUT_RING_CACHE(depth ? depth->offset : color[0]->offset);
 
 	return GL_TRUE;
 }