Mesa (master): freedreno: use util_copy_framebuffer_state()

[Rob Clark]

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

Author: Rob Clark <robclark at freedesktop.org>
Date:   Wed Jun 18 13:50:14 2014 -0400

freedreno: use util_copy_framebuffer_state()

Signed-off-by: Rob Clark <robclark at freedesktop.org>

---

 src/gallium/drivers/freedreno/freedreno_state.c |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_state.c b/src/gallium/drivers/freedreno/freedreno_state.c
index 93fbc35..e7d783a 100644
--- a/src/gallium/drivers/freedreno/freedreno_state.c
+++ b/src/gallium/drivers/freedreno/freedreno_state.c
@@ -117,29 +117,18 @@ fd_set_framebuffer_state(struct pipe_context *pctx,
 {
 	struct fd_context *ctx = fd_context(pctx);
 	struct pipe_framebuffer_state *cso = &ctx->framebuffer;
-	unsigned i;
 
 	DBG("%d: cbufs[0]=%p, zsbuf=%p", ctx->needs_flush,
 			framebuffer->cbufs[0], framebuffer->zsbuf);
 
 	fd_context_render(pctx);
 
-	for (i = 0; i < framebuffer->nr_cbufs; i++)
-		pipe_surface_reference(&cso->cbufs[i], framebuffer->cbufs[i]);
-	for (; i < ctx->framebuffer.nr_cbufs; i++)
-		pipe_surface_reference(&cso->cbufs[i], NULL);
-
-	cso->nr_cbufs = framebuffer->nr_cbufs;
+	util_copy_framebuffer_state(cso, framebuffer);
 
 	if ((cso->width != framebuffer->width) ||
 			(cso->height != framebuffer->height))
 		ctx->needs_rb_fbd = true;
 
-	cso->width = framebuffer->width;
-	cso->height = framebuffer->height;
-
-	pipe_surface_reference(&cso->zsbuf, framebuffer->zsbuf);
-
 	ctx->dirty |= FD_DIRTY_FRAMEBUFFER;
 
 	ctx->disabled_scissor.minx = 0;