Mesa (10.1): st/mesa: remove trailing NULL colorbuffers

[Carl Worth]

Module: Mesa
Branch: 10.1
Commit: 4f3abcfee40531927e5b6ede1e67d995ab8ab182
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f3abcfee40531927e5b6ede1e67d995ab8ab182

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Apr 20 03:41:47 2014 +0200

st/mesa: remove trailing NULL colorbuffers

Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 8a1dfba73e5b675635108e7d8309444704b8fef4)

---

 src/mesa/state_tracker/st_atom_framebuffer.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index c08d912..053c912 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -90,6 +90,12 @@ update_framebuffer_state( struct st_context *st )
       pipe_surface_reference(&framebuffer->cbufs[i], NULL);
    }
 
+   /* Remove trailing GL_NONE draw buffers. */
+   while (framebuffer->nr_cbufs &&
+          !framebuffer->cbufs[framebuffer->nr_cbufs-1]) {
+      framebuffer->nr_cbufs--;
+   }
+
    /*
     * Depth/Stencil renderbuffer/surface.
     */