From: Patrice Mandin <pmandin@caramail.com>
Date: Fri, 22 Feb 2008 21:21:15 +0000 (+0100)
Subject: nv30: init zeta to NULL, use color pitch if no zeta
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d8a9d850b9d63c7398d596fad2dfd2f05e55ef7d;p=mesa.git

nv30: init zeta to NULL, use color pitch if no zeta
---

diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index db4dac24c74..aa3fe7837e4 100644
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -537,7 +537,7 @@ nv30_set_framebuffer_state(struct pipe_context *pipe,
 			   const struct pipe_framebuffer_state *fb)
 {
 	struct nv30_context *nv30 = nv30_context(pipe);
-	struct pipe_surface *rt[4], *zeta;
+	struct pipe_surface *rt[4], *zeta = NULL;
 	uint32_t rt_enable, rt_format, w, h;
 	int i, colour_format = 0, zeta_format = 0;
 
@@ -603,8 +603,15 @@ nv30_set_framebuffer_state(struct pipe_context *pipe,
 	}
 
 	if (rt_enable & NV34TCL_RT_ENABLE_COLOR0) {
+		uint32_t pitch = rt[0]->pitch * rt[0]->cpp;
+		if (zeta) {
+			pitch |= (zeta->pitch * zeta->cpp)<<16;
+		} else {
+			pitch |= pitch<<16;
+		}
+
 		BEGIN_RING(rankine, NV34TCL_COLOR0_PITCH, 1);
-		OUT_RING  ( (rt[0]->pitch * rt[0]->cpp) | ( (zeta->pitch * zeta->cpp) << 16) );
+		OUT_RING  ( pitch );
 		nv30->rt[0] = rt[0]->buffer;
 	}