zink: make a bunch of descriptor functions static

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10177>

3 files changed, 11 insertions, 33 deletions

diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c
index 958897800cf..2ed08a765a8 100644
--- a/src/gallium/drivers/zink/zink_descriptors.c
+++ b/src/gallium/drivers/zink/zink_descriptors.c
@@ -286,7 +286,13 @@ punt_invalid_set(struct zink_descriptor_set *zds, struct hash_entry *he)
    zds->punted = true;
 }
 
-struct zink_descriptor_set *
+static void
+zink_descriptor_set_invalidate(struct zink_descriptor_set *zds)
+{
+   zds->invalid = true;
+}
+
+static struct zink_descriptor_set *
 zink_descriptor_set_get(struct zink_context *ctx,
                                enum zink_descriptor_type type,
                                bool is_compute,
@@ -464,25 +470,25 @@ desc_set_ref_add(struct zink_descriptor_set *zds, struct zink_descriptor_refs *r
       util_dynarray_append(&refs->refs, struct zink_descriptor_reference, ref);
 }
 
-void
+static void
 zink_image_view_desc_set_add(struct zink_image_view *image_view, struct zink_descriptor_set *zds, unsigned idx)
 {
    desc_set_ref_add(zds, &image_view->desc_set_refs, (void**)&zds->image_views[idx], image_view);
 }
 
-void
+static void
 zink_sampler_state_desc_set_add(struct zink_sampler_state *sampler_state, struct zink_descriptor_set *zds, unsigned idx)
 {
    desc_set_ref_add(zds, &sampler_state->desc_set_refs, (void**)&zds->sampler_states[idx], sampler_state);
 }
 
-void
+static void
 zink_sampler_view_desc_set_add(struct zink_sampler_view *sampler_view, struct zink_descriptor_set *zds, unsigned idx)
 {
    desc_set_ref_add(zds, &sampler_view->desc_set_refs, (void**)&zds->sampler_views[idx], sampler_view);
 }
 
-void
+static void
 zink_resource_desc_set_add(struct zink_resource *res, struct zink_descriptor_set *zds, unsigned idx)
 {
    desc_set_ref_add(zds, res ? &res->obj->desc_set_refs : NULL, (void**)&zds->res_objs[idx], res ? res->obj : NULL);
@@ -619,12 +625,6 @@ zink_descriptor_program_init(struct zink_context *ctx,
    return true;
 }
 
-void
-zink_descriptor_set_invalidate(struct zink_descriptor_set *zds)
-{
-   zds->invalid = true;
-}
-
 #ifndef NDEBUG
 static void
 descriptor_pool_clear(struct hash_table *ht)
diff --git a/src/gallium/drivers/zink/zink_descriptors.h b/src/gallium/drivers/zink/zink_descriptors.h
index dd94fa01a18..ee6ffd91bcc 100644
--- a/src/gallium/drivers/zink/zink_descriptors.h
+++ b/src/gallium/drivers/zink/zink_descriptors.h
@@ -136,21 +136,6 @@ void
 zink_descriptor_set_refs_clear(struct zink_descriptor_refs *refs, void *ptr);
 
 void
-zink_image_view_desc_set_add(struct zink_image_view *image_view, struct zink_descriptor_set *zds, unsigned idx);
-void
-zink_sampler_state_desc_set_add(struct zink_sampler_state *sampler_state, struct zink_descriptor_set *zds, unsigned idx);
-void
-zink_sampler_view_desc_set_add(struct zink_sampler_view *sv, struct zink_descriptor_set *zds, unsigned idx);
-void
-zink_resource_desc_set_add(struct zink_resource *res, struct zink_descriptor_set *zds, unsigned idx);
-
-struct zink_descriptor_set *
-zink_descriptor_set_get(struct zink_context *ctx,
-                               enum zink_descriptor_type type,
-                               bool is_compute,
-                               bool *cache_hit,
-                               bool *need_resource_refs);
-void
 zink_descriptor_set_recycle(struct zink_descriptor_set *zds);
 
 bool
@@ -159,9 +144,6 @@ zink_descriptor_program_init(struct zink_context *ctx,
                        struct zink_program *pg);
 
 void
-zink_descriptor_set_invalidate(struct zink_descriptor_set *zds);
-
-void
 zink_descriptor_pool_free(struct zink_screen *screen, struct zink_descriptor_pool *pool);
 
 void
diff --git a/src/gallium/drivers/zink/zink_resource.h b/src/gallium/drivers/zink/zink_resource.h
index 61153b2e302..64b9f84ab06 100644
--- a/src/gallium/drivers/zink/zink_resource.h
+++ b/src/gallium/drivers/zink/zink_resource.h
@@ -139,10 +139,6 @@ bool
 zink_resource_has_curr_read_usage(struct zink_context *ctx, struct zink_resource *res);
 
 void
-zink_resource_desc_set_add(struct zink_resource *res, struct zink_descriptor_set *zds, unsigned idx);
-
-
-void
 zink_destroy_resource_object(struct zink_screen *screen, struct zink_resource_object *resource_object);
 
 void