Module: Mesa Branch: master Commit: 564bb1410cf72901650c61c5f757eb0c4e26d5f0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=564bb1410cf72901650c61c5f757eb0c4e26d5f0
Author: Mike Blumenkrantz <[email protected]> Date: Mon Sep 21 09:16:33 2020 -0400 zink: slightly refactor batch resource referencing in update_descriptors() this is easier to debug Reviewed-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8942> --- src/gallium/drivers/zink/zink_draw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c index 148d1b2e6cd..f1edad96c60 100644 --- a/src/gallium/drivers/zink/zink_draw.c +++ b/src/gallium/drivers/zink/zink_draw.c @@ -461,10 +461,10 @@ update_descriptors(struct zink_context *ctx, struct zink_screen *screen, bool is if (num_wds > 0) { for (int i = 0; i < num_wds; ++i) { wds[i].dstSet = desc_set; - if (read_desc_resources[i]) - need_flush |= zink_batch_reference_resource_rw(batch, read_desc_resources[i], false) == check_flush_id; - else if (write_desc_resources[i]) - need_flush |= zink_batch_reference_resource_rw(batch, write_desc_resources[i], true) == check_flush_id; + struct zink_resource *res = read_desc_resources[i] ? read_desc_resources[i] : write_desc_resources[i]; + if (res) { + need_flush |= zink_batch_reference_resource_rw(batch, res, res == write_desc_resources[i]) == check_flush_id; + } } vkUpdateDescriptorSets(screen->dev, num_wds, wds, 0, NULL); for (int i = 0; i < num_surface_refs; i++) { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
