Mesa (main): Revert "radv: Make fill_buffer_shader non-static"

[GitLab Mirror]

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

Author: Konstantin Seurer <konstantin.seurer at gmail.com>
Date:   Sun May 15 12:52:58 2022 +0200

Revert "radv: Make fill_buffer_shader non-static"

We do not need this any longer since
radv_acceleration_structure.c uses
radv_fill_buffer now instead.

Signed-off-by: Konstantin Seurer <konstantin.seurer at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16517>

---

 src/amd/vulkan/radv_meta_buffer.c | 7 +++----
 src/amd/vulkan/radv_private.h     | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/amd/vulkan/radv_meta_buffer.c b/src/amd/vulkan/radv_meta_buffer.c
index 11396ae638a..f4eb2c5886b 100644
--- a/src/amd/vulkan/radv_meta_buffer.c
+++ b/src/amd/vulkan/radv_meta_buffer.c
@@ -167,9 +167,8 @@ radv_device_finish_meta_buffer_state(struct radv_device *device)
                               &state->alloc);
 }
 
-void
-radv_fill_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t size,
-                        uint32_t data)
+static void
+fill_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t size, uint32_t data)
 {
    struct radv_device *device = cmd_buffer->device;
    struct radv_meta_saved_state saved_state;
@@ -264,7 +263,7 @@ radv_fill_buffer(struct radv_cmd_buffer *cmd_buffer, const struct radv_image *im
       cmd_buffer->state.flush_bits |=
          radv_dst_access_flush(cmd_buffer, VK_ACCESS_2_SHADER_WRITE_BIT, image);
 
-      radv_fill_buffer_shader(cmd_buffer, va, size, value);
+      fill_buffer_shader(cmd_buffer, va, size, value);
 
       flush_bits = RADV_CMD_FLAG_CS_PARTIAL_FLUSH | RADV_CMD_FLAG_INV_VCACHE |
                    radv_src_access_flush(cmd_buffer, VK_ACCESS_2_SHADER_WRITE_BIT, image);
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index f80095e1949..7f7c3e494a4 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1676,8 +1676,6 @@ enum radv_cmd_flush_bits radv_dst_access_flush(struct radv_cmd_buffer *cmd_buffe
                                                const struct radv_image *image);
 uint32_t radv_fill_buffer(struct radv_cmd_buffer *cmd_buffer, const struct radv_image *image,
                           struct radeon_winsys_bo *bo, uint64_t va, uint64_t size, uint32_t value);
-void radv_fill_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t size,
-                             uint32_t data);
 void radv_copy_buffer(struct radv_cmd_buffer *cmd_buffer, struct radeon_winsys_bo *src_bo,
                       struct radeon_winsys_bo *dst_bo, uint64_t src_offset, uint64_t dst_offset,
                       uint64_t size);