From dc21b36daf9037f0747071e124b73f48ea5ff117 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 7 Nov 2013 16:59:40 -0700 Subject: [PATCH] util: set all unused cbufs to NULL in util_copy_framebuffer_state() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This helps fix an issue in the svga driver, and is just safer all-around. Reviewed-by: José Fonseca --- src/gallium/auxiliary/util/u_framebuffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- 2.30.2