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

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Nov  7 16:59:40 2013 -0700

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 at vmware.com>

---

 src/gallium/auxiliary/util/u_framebuffer.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_framebuffer.c b/src/gallium/auxiliary/util/u_framebuffer.c
index 7803ec6..f84485d 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;