Mesa (main): zink: move batch usage functions to static inlines

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May  7 08:14:53 2021 -0400

zink: move batch usage functions to static inlines

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

---

 src/gallium/drivers/zink/zink_batch.c | 20 --------------------
 src/gallium/drivers/zink/zink_batch.h | 28 +++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c
index 6c658ed01fc..9bc85fbb123 100644
--- a/src/gallium/drivers/zink/zink_batch.c
+++ b/src/gallium/drivers/zink/zink_batch.c
@@ -655,23 +655,3 @@ zink_batch_reference_image_view(struct zink_batch *batch,
    else
       zink_batch_reference_surface(batch, image_view->surface);
 }
-
-void
-zink_batch_usage_set(struct zink_batch_usage *u, uint32_t batch_id)
-{
-   p_atomic_set(&u->usage, batch_id);
-}
-
-bool
-zink_batch_usage_matches(struct zink_batch_usage *u, uint32_t batch_id)
-{
-   uint32_t usage = p_atomic_read(&u->usage);
-   return usage == batch_id;
-}
-
-bool
-zink_batch_usage_exists(struct zink_batch_usage *u)
-{
-   uint32_t usage = p_atomic_read(&u->usage);
-   return !!usage;
-}
diff --git a/src/gallium/drivers/zink/zink_batch.h b/src/gallium/drivers/zink/zink_batch.h
index 2d1525c32ef..1314db68b66 100644
--- a/src/gallium/drivers/zink/zink_batch.h
+++ b/src/gallium/drivers/zink/zink_batch.h
@@ -174,16 +174,30 @@ zink_batch_state_reference(struct zink_screen *screen,
    if (dst) *dst = src;
 }
 
-void
-zink_batch_usage_set(struct zink_batch_usage *u, uint32_t batch_id);
-bool
-zink_batch_usage_matches(struct zink_batch_usage *u, uint32_t batch_id);
-bool
-zink_batch_usage_exists(struct zink_batch_usage *u);
-
 static inline void
 zink_batch_usage_unset(struct zink_batch_usage *u, uint32_t batch_id)
 {
    p_atomic_cmpxchg(&u->usage, batch_id, 0);
 }
+
+static inline void
+zink_batch_usage_set(struct zink_batch_usage *u, uint32_t batch_id)
+{
+   p_atomic_set(&u->usage, batch_id);
+}
+
+static inline bool
+zink_batch_usage_matches(struct zink_batch_usage *u, uint32_t batch_id)
+{
+   uint32_t usage = p_atomic_read(&u->usage);
+   return usage == batch_id;
+}
+
+static inline bool
+zink_batch_usage_exists(struct zink_batch_usage *u)
+{
+   uint32_t usage = p_atomic_read(&u->usage);
+   return !!usage;
+}
+
 #endif