Revert "radv: Make fill_buffer_shader non-static"
authorKonstantin Seurer <konstantin.seurer@gmail.com>
Sun, 15 May 2022 10:52:58 +0000 (12:52 +0200)
committerMarge Bot <emma+marge@anholt.net>
Tue, 17 May 2022 13:10:07 +0000 (13:10 +0000)
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@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16517>

src/amd/vulkan/radv_meta_buffer.c
src/amd/vulkan/radv_private.h

index 11396ae..f4eb2c5 100644 (file)
@@ -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);
index f80095e..7f7c3e4 100644 (file)
@@ -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);