From 35f94b1942d9b99463ef9e179ebf70809e3bea69 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Sun, 26 Sep 2010 19:26:24 +0200 Subject: r600g: Cleaned up index buffer reference handling in the draw module. This fixes a buffer leak. Signed-off-by: Tilman Sauerbeck --- src/gallium/drivers/r600/r600_state2.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers/r600/r600_state2.c') diff --git a/src/gallium/drivers/r600/r600_state2.c b/src/gallium/drivers/r600/r600_state2.c index 796442f5a4..bbbf2790cc 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: -- cgit v1.2.3