From 530683096bf3141576790c53aa49a3339fc265f7 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 9 Aug 2022 14:11:46 +0200 Subject: [PATCH] gallium/u_transfer_helper: hide deinterleave helpers There's no more callers of these, so let's make them an implementation detail instead of public API. Reviewed-by: Alyssa Rosenzweig Part-of: --- src/gallium/auxiliary/util/u_transfer_helper.c | 15 +++++++++++++-- src/gallium/auxiliary/util/u_transfer_helper.h | 10 ---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/gallium/auxiliary/util/u_transfer_helper.c b/src/gallium/auxiliary/util/u_transfer_helper.c index 43e4aba8ada..6dc8afa63f7 100644 --- a/src/gallium/auxiliary/util/u_transfer_helper.c +++ b/src/gallium/auxiliary/util/u_transfer_helper.c @@ -243,6 +243,13 @@ transfer_map_msaa(struct pipe_context *pctx, return ss_map; } +static void * +u_transfer_helper_deinterleave_transfer_map(struct pipe_context *pctx, + struct pipe_resource *prsc, + unsigned level, unsigned usage, + const struct pipe_box *box, + struct pipe_transfer **pptrans); + void * u_transfer_helper_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc, @@ -519,6 +526,10 @@ u_transfer_helper_transfer_flush_region(struct pipe_context *pctx, } } +static void +u_transfer_helper_deinterleave_transfer_unmap(struct pipe_context *pctx, + struct pipe_transfer *ptrans); + void u_transfer_helper_transfer_unmap(struct pipe_context *pctx, struct pipe_transfer *ptrans) @@ -592,7 +603,7 @@ u_transfer_helper_destroy(struct u_transfer_helper *helper) * drivers should expect to be passed the same buffer repeatedly with the format changed * to indicate which component is being mapped */ -void * +static void * u_transfer_helper_deinterleave_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc, unsigned level, unsigned usage, @@ -696,7 +707,7 @@ fail: return NULL; } -void +static void u_transfer_helper_deinterleave_transfer_unmap(struct pipe_context *pctx, struct pipe_transfer *ptrans) { diff --git a/src/gallium/auxiliary/util/u_transfer_helper.h b/src/gallium/auxiliary/util/u_transfer_helper.h index 5c851413c5f..4b7707f4670 100644 --- a/src/gallium/auxiliary/util/u_transfer_helper.h +++ b/src/gallium/auxiliary/util/u_transfer_helper.h @@ -136,16 +136,6 @@ u_transfer_helper_create(const struct u_transfer_vtbl *vtbl, void u_transfer_helper_destroy(struct u_transfer_helper *helper); -void * -u_transfer_helper_deinterleave_transfer_map(struct pipe_context *pctx, - struct pipe_resource *prsc, - unsigned level, unsigned usage, - const struct pipe_box *box, - struct pipe_transfer **pptrans); - -void -u_transfer_helper_deinterleave_transfer_unmap(struct pipe_context *pctx, - struct pipe_transfer *ptrans); #ifdef __cplusplus } // extern "C" { #endif