Mesa (main): zink: use resource batch usage helpers in invalidate_buffer()

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 79ccc17da5d867dc43a0ee6f9468c94e21b87943
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=79ccc17da5d867dc43a0ee6f9468c94e21b87943

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Jul  7 09:37:35 2021 -0400

zink: use resource batch usage helpers in invalidate_buffer()

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12008>

---

 src/gallium/drivers/zink/zink_resource.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 895b66cad4f..5d197a4c22d 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -1031,18 +1031,18 @@ invalidate_buffer(struct zink_context *ctx, struct zink_resource *res)
    res->bind_history &= ~ZINK_RESOURCE_USAGE_STREAMOUT;
 
    util_range_set_empty(&res->valid_buffer_range);
-   if (!get_resource_usage(res))
+   if (!zink_resource_has_usage(res))
       return false;
 
    struct zink_resource_object *old_obj = res->obj;
+   bool has_usage = zink_resource_has_usage(res);
    struct zink_resource_object *new_obj = resource_object_create(screen, &res->base.b, NULL, NULL, NULL, 0);
    if (!new_obj) {
       debug_printf("new backing resource alloc failed!");
       return false;
    }
    bool needs_unref = true;
-   if (zink_batch_usage_exists(old_obj->reads) ||
-       zink_batch_usage_exists(old_obj->writes)) {
+   if (has_usage) {
       zink_batch_reference_resource_move(&ctx->batch, res);
       needs_unref = false;
    }