From: Brian Paul <brianp@vmware.com>
Date: Mon, 11 May 2009 22:27:50 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e7cb125b2d9e9c7b1ad89b988fa3bf53ead9eb0c;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	src/mesa/main/version.h
---

e7cb125b2d9e9c7b1ad89b988fa3bf53ead9eb0c
diff --cc src/mesa/state_tracker/st_atom_framebuffer.c
index f23186c73de,536293683e9..4d897b677e0
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@@ -120,13 -118,19 +118,20 @@@ update_framebuffer_state( struct st_con
           }
  
           if (strb->surface) {
-             framebuffer->cbufs[framebuffer->nr_cbufs] = strb->surface;
+             pipe_surface_reference(&framebuffer->cbufs[framebuffer->nr_cbufs],
+                                    strb->surface);
              framebuffer->nr_cbufs++;
           }
 +         strb->defined = GL_TRUE; /* we'll be drawing something */
        }
     }
+    for (i = framebuffer->nr_cbufs; i < PIPE_MAX_COLOR_BUFS; i++) {
+       pipe_surface_reference(&framebuffer->cbufs[i], NULL);
+    }
  
+    /*
+     * Depth/Stencil renderbuffer/surface.
+     */
     strb = st_renderbuffer(fb->Attachment[BUFFER_DEPTH].Renderbuffer);
     if (strb) {
        strb = st_renderbuffer(strb->Base.Wrapped);