From 33e117ed7f3c48d3dbeda9a28603a121eac7a860 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 15 Apr 2021 12:50:19 -0400 Subject: [PATCH] st/pbo: use cso_set_vertex_buffers_and_elements() for st_pbo_draw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this lets us use the more consistent codepath and ordering (buffers -> elems) as well as set take_ownership=true to skip the unref Reviewed-by: Marek Olšák Part-of: --- src/mesa/state_tracker/st_pbo.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mesa/state_tracker/st_pbo.c b/src/mesa/state_tracker/st_pbo.c index ddd3a19ed73..3430e57ffdf 100644 --- a/src/mesa/state_tracker/st_pbo.c +++ b/src/mesa/state_tracker/st_pbo.c @@ -253,12 +253,8 @@ st_pbo_draw(struct st_context *st, const struct st_pbo_addresses *addr, velem.velems[0].vertex_buffer_index = 0; velem.velems[0].src_format = PIPE_FORMAT_R32G32_FLOAT; - cso_set_vertex_elements(cso, &velem); - - cso_set_vertex_buffers(cso, 0, 1, &vbo); + cso_set_vertex_buffers_and_elements(cso, &velem, 1, 0, true, false, &vbo); st->last_num_vbuffers = MAX2(st->last_num_vbuffers, 1); - - pipe_resource_reference(&vbo.buffer.resource, NULL); } /* Upload constants */