From d819b1fcec02be5e0cfc87b6246833a2a2d5f034 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 24 Aug 2017 10:40:28 -0600 Subject: [PATCH] gallium/vbuf: fix buffer reference bugs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In two places we called pipe_resource_reference() to remove a reference to a vertex buffer resource. But we neglected to check if the buffer was a user buffer and not a pipe_resource. This caused us to pass an invalid pipe_resource pointer to pipe_resource_reference(). Instead of calling pipe_resource_reference(&vbuf->resource, NULL), use pipe_vertex_buffer_unreference(&vbuf) which checks the is_user_buffer field and does the right thing. Also, explicity set the is_user_buffer field to false after setting the vbuf->resource pointer to out_buffer. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102377 Reviewed-by: Marek Olšák Tested-by: Bruce Cherniak --- src/gallium/auxiliary/util/u_vbuf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gallium/auxiliary/util/u_vbuf.c b/src/gallium/auxiliary/util/u_vbuf.c index 6dc8bc7..80c30ac 100644 --- a/src/gallium/auxiliary/util/u_vbuf.c +++ b/src/gallium/auxiliary/util/u_vbuf.c @@ -513,9 +513,9 @@ u_vbuf_translate_buffers(struct u_vbuf *mgr, struct translate_key *key, mgr->real_vertex_buffer[out_vb].stride = key->output_stride; /* Move the buffer reference. */ - pipe_resource_reference( - &mgr->real_vertex_buffer[out_vb].buffer.resource, NULL); + pipe_vertex_buffer_unreference(&mgr->real_vertex_buffer[out_vb]); mgr->real_vertex_buffer[out_vb].buffer.resource = out_buffer; + mgr->real_vertex_buffer[out_vb].is_user_buffer = false; return PIPE_OK; } @@ -833,8 +833,7 @@ void u_vbuf_set_vertex_buffers(struct u_vbuf *mgr, unsigned dst_index = start_slot + i; pipe_vertex_buffer_unreference(&mgr->vertex_buffer[dst_index]); - pipe_resource_reference(&mgr->real_vertex_buffer[dst_index].buffer.resource, - NULL); + pipe_vertex_buffer_unreference(&mgr->real_vertex_buffer[dst_index]); } pipe->set_vertex_buffers(pipe, start_slot, count, NULL); -- 2.7.4