This fixes a buffer leak.

Signed-off-by: Tilman Sauerbeck <til...@code-monkey.de>
---

This patch fixes the same problem in the new design, too.

 src/gallium/drivers/r600/r600_buffer.c |    5 ++++-
 src/gallium/drivers/r600/r600_draw.c   |    4 +++-
 src/gallium/drivers/r600/r600_state2.c |    9 +++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_buffer.c 
b/src/gallium/drivers/r600/r600_buffer.c
index 1621b2a..d734e23 100644
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -280,7 +280,10 @@ int r600_upload_index_buffer(struct r600_context *rctx,
                        goto done;
                }
                draw->index_buffer_offset = index_offset;
-               draw->index_buffer = upload_buffer;
+
+               /* Transfer ownership. */
+               pipe_resource_reference(&draw->index_buffer, upload_buffer);
+               pipe_resource_reference(&upload_buffer, NULL);
        }
 
 done:
diff --git a/src/gallium/drivers/r600/r600_draw.c 
b/src/gallium/drivers/r600/r600_draw.c
index afc3b7b..c41156f 100644
--- a/src/gallium/drivers/r600/r600_draw.c
+++ b/src/gallium/drivers/r600/r600_draw.c
@@ -168,7 +168,7 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct 
pipe_draw_info *info)
                                            info->count);
 
                draw.index_size = rctx->index_buffer.index_size;
-               draw.index_buffer = rctx->index_buffer.buffer;
+               pipe_resource_reference(&draw.index_buffer, 
rctx->index_buffer.buffer);
                draw.index_buffer_offset = draw.start * draw.index_size;
                draw.start = 0;
                r600_upload_index_buffer(rctx, &draw);
@@ -185,4 +185,6 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct 
pipe_draw_info *info)
        r = r600_draw_common(&draw);
        if (r)
          fprintf(stderr,"draw common failed %d\n", r);
+
+       pipe_resource_reference(&draw.index_buffer, NULL);
 }
diff --git a/src/gallium/drivers/r600/r600_state2.c 
b/src/gallium/drivers/r600/r600_state2.c
index 796442f..bbbf279 100644
--- a/src/gallium/drivers/r600/r600_state2.c
+++ b/src/gallium/drivers/r600/r600_state2.c
@@ -672,7 +672,7 @@ static void r600_draw_vbo2(struct pipe_context *ctx, const 
struct pipe_draw_info
                                            info->count);
 
                draw.index_size = rctx->index_buffer.index_size;
-               draw.index_buffer = rctx->index_buffer.buffer;
+               pipe_resource_reference(&draw.index_buffer, 
rctx->index_buffer.buffer);
                draw.index_buffer_offset = draw.start * draw.index_size;
                draw.start = 0;
                r600_upload_index_buffer2(rctx, &draw);
@@ -684,6 +684,8 @@ static void r600_draw_vbo2(struct pipe_context *ctx, const 
struct pipe_draw_info
                draw.index_bias = info->start;
        }
        r600_draw_common(&draw);
+
+       pipe_resource_reference(&draw.index_buffer, NULL);
 }
 
 static void r600_flush2(struct pipe_context *ctx, unsigned flags,
@@ -2463,7 +2465,10 @@ int r600_upload_index_buffer2(struct r600_pipe_context 
*rctx, struct r600_drawl
                        goto done;
                }
                draw->index_buffer_offset = index_offset;
-               draw->index_buffer = upload_buffer;
+
+               /* Transfer ownership. */
+               pipe_resource_reference(&draw->index_buffer, upload_buffer);
+               pipe_resource_reference(&upload_buffer, NULL);
        }
 
 done:
-- 
1.7.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to