From: Brian Paul <brianp@vmware.com>
Date: Thu, 7 Nov 2013 23:59:40 +0000 (-0700)
Subject: util: set all unused cbufs to NULL in util_copy_framebuffer_state()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dc21b36daf9037f0747071e124b73f48ea5ff117;p=mesa.git

util: set all unused cbufs to NULL in util_copy_framebuffer_state()

This helps fix an issue in the svga driver, and is just safer all-around.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
---

diff --git a/src/gallium/auxiliary/util/u_framebuffer.c b/src/gallium/auxiliary/util/u_framebuffer.c
index 7803ec6a8b5..f84485d1f1c 100644
--- a/src/gallium/auxiliary/util/u_framebuffer.c
+++ b/src/gallium/auxiliary/util/u_framebuffer.c
@@ -88,7 +88,8 @@ util_copy_framebuffer_state(struct pipe_framebuffer_state *dst,
    for (i = 0; i < src->nr_cbufs; i++)
       pipe_surface_reference(&dst->cbufs[i], src->cbufs[i]);
 
-   for (i = src->nr_cbufs; i < dst->nr_cbufs; i++)
+   /* Set remaining dest cbuf pointers to NULL */
+   for ( ; i < Elements(dst->cbufs); i++)
       pipe_surface_reference(&dst->cbufs[i], NULL);
 
    dst->nr_cbufs = src->nr_cbufs;