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 */