Module: Mesa Branch: master Commit: eeaf7b51f382f53beea742ddc6ded81abbeca72c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eeaf7b51f382f53beea742ddc6ded81abbeca72c
Author: Mike Blumenkrantz <[email protected]> Date: Fri Sep 18 12:13:39 2020 -0400 zink: fix xfb buffer refcounting we need to always ref the counter buffer to the current batch, not just when using it for resumign xfb Reviewed-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8984> --- src/gallium/drivers/zink/zink_draw.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c index 6641c766511..96b45fbb0dd 100644 --- a/src/gallium/drivers/zink/zink_draw.c +++ b/src/gallium/drivers/zink/zink_draw.c @@ -717,13 +717,15 @@ zink_draw_vbo(struct pipe_context *pctx, if (ctx->num_so_targets) { for (unsigned i = 0; i < ctx->num_so_targets; i++) { struct zink_so_target *t = zink_so_target(ctx->so_targets[i]); - if (t && t->counter_buffer_valid) { + counter_buffers[i] = VK_NULL_HANDLE; + if (t) { struct zink_resource *res = zink_resource(t->counter_buffer); zink_batch_reference_resource_rw(batch, res, true); - counter_buffers[i] = res->buffer; - counter_buffer_offsets[i] = t->counter_buffer_offset; - } else - counter_buffers[i] = VK_NULL_HANDLE; + if (t->counter_buffer_valid) { + counter_buffers[i] = res->buffer; + counter_buffer_offsets[i] = t->counter_buffer_offset; + } + } } screen->vk_CmdBeginTransformFeedbackEXT(batch->cmdbuf, 0, ctx->num_so_targets, counter_buffers, counter_buffer_offsets); } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
