Module: Mesa Branch: main Commit: cb65ac9bdf095f67b5d58c2a1060eb4e377c27f0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb65ac9bdf095f67b5d58c2a1060eb4e377c27f0
Author: Mike Blumenkrantz <[email protected]> Date: Wed Sep 8 15:21:52 2021 -0400 zink: add return values for resource usage unsetting Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12845> --- src/gallium/drivers/zink/zink_bo.h | 3 ++- src/gallium/drivers/zink/zink_resource.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/zink/zink_bo.h b/src/gallium/drivers/zink/zink_bo.h index a8ddb046024..0fd74cb7923 100644 --- a/src/gallium/drivers/zink/zink_bo.h +++ b/src/gallium/drivers/zink/zink_bo.h @@ -245,11 +245,12 @@ zink_bo_usage_set(struct zink_bo *bo, struct zink_batch_state *bs, bool write) zink_batch_usage_set(&bo->reads, bs); } -static inline void +static inline bool zink_bo_usage_unset(struct zink_bo *bo, struct zink_batch_state *bs) { zink_batch_usage_unset(&bo->reads, bs); zink_batch_usage_unset(&bo->writes, bs); + return bo->reads || bo->writes; } diff --git a/src/gallium/drivers/zink/zink_resource.h b/src/gallium/drivers/zink/zink_resource.h index 9a5ddf2aa09..c39f6d08deb 100644 --- a/src/gallium/drivers/zink/zink_resource.h +++ b/src/gallium/drivers/zink/zink_resource.h @@ -241,10 +241,10 @@ zink_resource_usage_set(struct zink_resource *res, struct zink_batch_state *bs, zink_bo_usage_set(res->obj->bo, bs, write); } -static inline void +static inline bool zink_resource_object_usage_unset(struct zink_resource_object *obj, struct zink_batch_state *bs) { - zink_bo_usage_unset(obj->bo, bs); + return zink_bo_usage_unset(obj->bo, bs); } #endif
