Mesa (master): nouveau: nv30: use texture width, height for render target dimensions

[Patrice Mandin]

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

Author: Patrice Mandin <patmandin at gmail.com>
Date:   Tue Oct 13 22:53:32 2009 +0200

nouveau: nv30: use texture width,height for render target dimensions

---

 src/gallium/drivers/nv30/nv30_state_fb.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nv30/nv30_state_fb.c b/src/gallium/drivers/nv30/nv30_state_fb.c
index 44b6a74..2729dce 100644
--- a/src/gallium/drivers/nv30/nv30_state_fb.c
+++ b/src/gallium/drivers/nv30/nv30_state_fb.c
@@ -40,10 +40,9 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
 		for (i = 1; i < fb->nr_cbufs; i++)
 			assert(!(rt[i]->base.texture->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR));
 
-		/* FIXME: NV34TCL_RT_FORMAT_LOG2_[WIDTH/HEIGHT] */
 		rt_format = NV34TCL_RT_FORMAT_TYPE_SWIZZLED |
-		log2i(fb->width) << 16 /*NV34TCL_RT_FORMAT_LOG2_WIDTH_SHIFT*/ |
-		log2i(fb->height) << 24 /*NV34TCL_RT_FORMAT_LOG2_HEIGHT_SHIFT*/;
+			    (log2i(rt[0]->base.width) << NV34TCL_RT_FORMAT_LOG2_WIDTH_SHIFT) |
+			    (log2i(rt[0]->base.height) << NV34TCL_RT_FORMAT_LOG2_HEIGHT_SHIFT);
 	}
 	else
 		rt_format = NV34TCL_RT_FORMAT_TYPE_LINEAR;