Module: Mesa Branch: main Commit: 02c5365ffa9d87d95cce9660bc75751b5a81c077 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=02c5365ffa9d87d95cce9660bc75751b5a81c077
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Tue Jan 2 14:15:24 2024 +0100 radv: make a couple of NIR RT functions as static Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26851> --- src/amd/vulkan/radv_rt_common.c | 8 ++++---- src/amd/vulkan/radv_rt_common.h | 11 ----------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/amd/vulkan/radv_rt_common.c b/src/amd/vulkan/radv_rt_common.c index 722fd772913..8fb70291875 100644 --- a/src/amd/vulkan/radv_rt_common.c +++ b/src/amd/vulkan/radv_rt_common.c @@ -31,7 +31,7 @@ static nir_def *build_node_to_addr(struct radv_device *device, nir_builder *b, nir_def *node, bool skip_type_and); -void +static void nir_sort_hit_pair(nir_builder *b, nir_variable *var_distances, nir_variable *var_indices, uint32_t chan_1, uint32_t chan_2) { @@ -54,7 +54,7 @@ nir_sort_hit_pair(nir_builder *b, nir_variable *var_distances, nir_variable *var nir_pop_if(b, NULL); } -nir_def * +static nir_def * intersect_ray_amd_software_box(struct radv_device *device, nir_builder *b, nir_def *bvh_node, nir_def *ray_tmax, nir_def *origin, nir_def *dir, nir_def *inv_dir) { @@ -151,7 +151,7 @@ intersect_ray_amd_software_box(struct radv_device *device, nir_builder *b, nir_d return nir_load_var(b, child_indices); } -nir_def * +static nir_def * intersect_ray_amd_software_tri(struct radv_device *device, nir_builder *b, nir_def *bvh_node, nir_def *ray_tmax, nir_def *origin, nir_def *dir, nir_def *inv_dir) { @@ -325,7 +325,7 @@ hit_is_opaque(nir_builder *b, nir_def *sbt_offset_and_flags, const struct radv_r return opaque; } -nir_def * +static nir_def * create_bvh_descriptor(nir_builder *b) { /* We create a BVH descriptor that covers the entire memory range. That way we can always diff --git a/src/amd/vulkan/radv_rt_common.h b/src/amd/vulkan/radv_rt_common.h index 9b098c2d193..6973bb246c4 100644 --- a/src/amd/vulkan/radv_rt_common.h +++ b/src/amd/vulkan/radv_rt_common.h @@ -32,23 +32,12 @@ #include "radv_private.h" -void nir_sort_hit_pair(nir_builder *b, nir_variable *var_distances, nir_variable *var_indices, uint32_t chan_1, - uint32_t chan_2); - -nir_def *intersect_ray_amd_software_box(struct radv_device *device, nir_builder *b, nir_def *bvh_node, - nir_def *ray_tmax, nir_def *origin, nir_def *dir, nir_def *inv_dir); - -nir_def *intersect_ray_amd_software_tri(struct radv_device *device, nir_builder *b, nir_def *bvh_node, - nir_def *ray_tmax, nir_def *origin, nir_def *dir, nir_def *inv_dir); - nir_def *build_addr_to_node(nir_builder *b, nir_def *addr); nir_def *nir_build_vec3_mat_mult(nir_builder *b, nir_def *vec, nir_def *matrix[], bool translation); void nir_build_wto_matrix_load(nir_builder *b, nir_def *instance_addr, nir_def **out); -nir_def *create_bvh_descriptor(nir_builder *b); - struct radv_ray_traversal_args; struct radv_ray_flags {
