Mesa (main): zink: make void swizzle clamping util public

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue Apr  6 10:22:03 2021 -0400

zink: make void swizzle clamping util public

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

---

 src/gallium/drivers/zink/zink_context.c | 12 ++++++------
 src/gallium/drivers/zink/zink_context.h |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index dd2128ba9ed..f5808219abe 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -647,8 +647,8 @@ out:
    return buffer_view;
 }
 
-static inline enum pipe_swizzle
-clamp_void_swizzle(const struct util_format_description *desc, enum pipe_swizzle swizzle)
+enum pipe_swizzle
+zink_clamp_void_swizzle(const struct util_format_description *desc, enum pipe_swizzle swizzle)
 {
    switch (swizzle) {
    case PIPE_SWIZZLE_X:
@@ -718,10 +718,10 @@ zink_create_sampler_view(struct pipe_context *pctx, struct pipe_resource *pres,
           */
           if (zink_format_is_voidable_rgba_variant(state->format)) {
              const struct util_format_description *desc = util_format_description(state->format);
-             sampler_view->base.swizzle_r = clamp_void_swizzle(desc, sampler_view->base.swizzle_r);
-             sampler_view->base.swizzle_g = clamp_void_swizzle(desc, sampler_view->base.swizzle_g);
-             sampler_view->base.swizzle_b = clamp_void_swizzle(desc, sampler_view->base.swizzle_b);
-             sampler_view->base.swizzle_a = clamp_void_swizzle(desc, sampler_view->base.swizzle_a);
+             sampler_view->base.swizzle_r = zink_clamp_void_swizzle(desc, sampler_view->base.swizzle_r);
+             sampler_view->base.swizzle_g = zink_clamp_void_swizzle(desc, sampler_view->base.swizzle_g);
+             sampler_view->base.swizzle_b = zink_clamp_void_swizzle(desc, sampler_view->base.swizzle_b);
+             sampler_view->base.swizzle_a = zink_clamp_void_swizzle(desc, sampler_view->base.swizzle_a);
           }
           ivci.components.r = zink_component_mapping(sampler_view->base.swizzle_r);
           ivci.components.g = zink_component_mapping(sampler_view->base.swizzle_g);
diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index aa914cbccbc..be60c21567e 100644
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -468,6 +468,9 @@ zink_component_mapping(enum pipe_swizzle swizzle)
    }
 }
 
+enum pipe_swizzle
+zink_clamp_void_swizzle(const struct util_format_description *desc, enum pipe_swizzle swizzle);
+
 bool
 zink_resource_rebind(struct zink_context *ctx, struct zink_resource *res);