Mesa (main): zink: delete zink_fb_clear_util_unpack_clear_color

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Jul  6 10:35:03 2022 -0400

zink: delete zink_fb_clear_util_unpack_clear_color

no longer used

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

---

 src/gallium/drivers/zink/zink_clear.c       | 6 ------
 src/gallium/drivers/zink/zink_clear.h       | 3 ---
 src/gallium/drivers/zink/zink_context.c     | 2 +-
 src/gallium/drivers/zink/zink_render_pass.c | 2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_clear.c b/src/gallium/drivers/zink/zink_clear.c
index caee33a384c..945c6b8a819 100644
--- a/src/gallium/drivers/zink/zink_clear.c
+++ b/src/gallium/drivers/zink/zink_clear.c
@@ -560,12 +560,6 @@ zink_fb_clear_first_needs_explicit(struct zink_framebuffer_clear *fb_clear)
    return zink_fb_clear_element_needs_explicit(zink_fb_clear_element(fb_clear, 0));
 }
 
-void
-zink_fb_clear_util_unpack_clear_color(struct zink_framebuffer_clear_data *clear, enum pipe_format format, union pipe_color_union *color)
-{
-   *color = clear->color.color;
-}
-
 static void
 fb_clears_apply_internal(struct zink_context *ctx, struct pipe_resource *pres, int i)
 {
diff --git a/src/gallium/drivers/zink/zink_clear.h b/src/gallium/drivers/zink/zink_clear.h
index 5f6492a17a7..e0a0e1fcbc0 100644
--- a/src/gallium/drivers/zink/zink_clear.h
+++ b/src/gallium/drivers/zink/zink_clear.h
@@ -129,6 +129,3 @@ zink_fb_clears_apply_or_discard(struct zink_context *ctx, struct pipe_resource *
 
 void
 zink_fb_clears_apply_region(struct zink_context *ctx, struct pipe_resource *pres, struct u_rect region);
-
-void
-zink_fb_clear_util_unpack_clear_color(struct zink_framebuffer_clear_data *clear, enum pipe_format format, union pipe_color_union *color);
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 2778b5d43df..07e95793fc3 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -2240,7 +2240,7 @@ begin_rendering(struct zink_context *ctx)
             continue;
       }
       /* we now know there's one clear that can be done here */
-      zink_fb_clear_util_unpack_clear_color(clear, ctx->fb_state.cbufs[i]->format, (void*)&ctx->dynamic_fb.attachments[i].clearValue);
+      memcpy(&ctx->dynamic_fb.attachments[i].clearValue, &clear->color.color, sizeof(float) * 4);
       ctx->dynamic_fb.attachments[i].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
    }
    if (ctx->fb_state.zsbuf && zink_fb_clear_enabled(ctx, PIPE_MAX_COLOR_BUFS)) {
diff --git a/src/gallium/drivers/zink/zink_render_pass.c b/src/gallium/drivers/zink/zink_render_pass.c
index c5c9b5aa739..8217751b51e 100644
--- a/src/gallium/drivers/zink/zink_render_pass.c
+++ b/src/gallium/drivers/zink/zink_render_pass.c
@@ -528,7 +528,7 @@ begin_render_pass(struct zink_context *ctx)
             continue;
       }
       /* we now know there's one clear that can be done here */
-      zink_fb_clear_util_unpack_clear_color(clear, fb_state->cbufs[i]->format, (void*)&clears[i].color);
+      memcpy(&clears[i].color, &clear->color.color, sizeof(float) * 4);
       rpbi.clearValueCount = i + 1;
       clear_validate |= PIPE_CLEAR_COLOR0 << i;
       assert(ctx->framebuffer->rp->state.clears);