diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 11:22:24 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 11:22:24 +0100 |
| commit | f1b679a372274041aa3e7a02f979390b17eb1ab5 (patch) | |
| tree | f5bad38b25c1e5bf69cb06b4236cccb4310f769f /mesalib/src/gallium/auxiliary/util/u_framebuffer.c | |
| parent | 3ef320ddf5d23b4e69cc7d44a17f902e245f6426 (diff) | |
| parent | b73c544c61712f7bd57f3c9a0f6046481f58038b (diff) | |
| download | vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.gz vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.bz2 vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman mesa fontconfig git update 12 nov 2013
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_framebuffer.c')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_framebuffer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_framebuffer.c b/mesalib/src/gallium/auxiliary/util/u_framebuffer.c index 7803ec6a8..f84485d1f 100644 --- a/mesalib/src/gallium/auxiliary/util/u_framebuffer.c +++ b/mesalib/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; |