Mesa (i965g-restart): i965g: keep refcounts to bound vertex buffers

[Keith Whitwell]

Module: Mesa
Branch: i965g-restart
Commit: 1ec7e058f50882b27c0a2abd961bd49848386ff7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ec7e058f50882b27c0a2abd961bd49848386ff7

Author: Keith Whitwell <keithw at vmware.com>
Date:   Mon Dec 21 16:56:46 2009 +0000

i965g: keep refcounts to bound vertex buffers

---

 src/gallium/drivers/i965/brw_pipe_vertex.c |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/i965/brw_pipe_vertex.c b/src/gallium/drivers/i965/brw_pipe_vertex.c
index 73bba5b..3d87a28 100644
--- a/src/gallium/drivers/i965/brw_pipe_vertex.c
+++ b/src/gallium/drivers/i965/brw_pipe_vertex.c
@@ -19,11 +19,26 @@ static void brw_set_vertex_buffers(struct pipe_context *pipe,
 				   const struct pipe_vertex_buffer *buffers)
 {
    struct brw_context *brw = brw_context(pipe);
+   unsigned i;
 
-   /* XXX: don't we need to take some references here?  It's a bit
-    * awkward to do so, though.
-    */
-   memcpy(brw->curr.vertex_buffer, buffers, count * sizeof(buffers[0]));
+   /* Check for no change */
+   if (count == brw->curr.num_vertex_buffers &&
+       memcmp(brw->curr.vertex_buffer,
+              buffers,
+              count * sizeof buffers[0]) == 0)
+      return;
+
+   /* Adjust refcounts */
+   for (i = 0; i < count; i++) 
+      pipe_buffer_reference(&brw->curr.vertex_buffer[i].buffer, 
+                            buffers[i].buffer);
+
+   for ( ; i < brw->curr.num_vertex_buffers; i++)
+      pipe_buffer_reference(&brw->curr.vertex_buffer[i].buffer,
+                            NULL);
+
+   /* Copy remaining data */
+   memcpy(brw->curr.vertex_buffer, buffers, count * sizeof buffers[0]);
    brw->curr.num_vertex_buffers = count;
 
    brw->state.dirty.mesa |= PIPE_NEW_VERTEX_BUFFER;