Mesa (main): radv: Do not pass result to insert_traversal_aabb_case

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Oct 4 12:16:03 UTC 2021


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

Author: Joshua Ashton <joshua at froggi.es>
Date:   Tue Sep 21 15:24:25 2021 +0100

radv: Do not pass result to insert_traversal_aabb_case

This is unused as it performs the tests itself.

Signed-off-by: Joshua Ashton <joshua at froggi.es>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12974>

---

 src/amd/vulkan/radv_pipeline_rt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c
index d63f23eb0c4..d78b0901abe 100644
--- a/src/amd/vulkan/radv_pipeline_rt.c
+++ b/src/amd/vulkan/radv_pipeline_rt.c
@@ -1359,7 +1359,7 @@ insert_traversal_triangle_case(struct radv_device *device,
 static void
 insert_traversal_aabb_case(struct radv_device *device,
                            const VkRayTracingPipelineCreateInfoKHR *pCreateInfo, nir_builder *b,
-                           nir_ssa_def *result, const struct rt_variables *vars,
+                           const struct rt_variables *vars,
                            const struct rt_traversal_vars *trav_vars, nir_ssa_def *bvh_node)
 {
    RADV_FROM_HANDLE(radv_pipeline_layout, layout, pCreateInfo->layout);
@@ -1616,8 +1616,7 @@ insert_traversal(struct radv_device *device, const VkRayTracingPipelineCreateInf
             nir_push_if(
                b, nir_ine(b, nir_iand(b, bvh_node_type, nir_imm_int(b, 1)), nir_imm_int(b, 0)));
             {
-               insert_traversal_aabb_case(device, pCreateInfo, b, result, vars, &trav_vars,
-                                          bvh_node);
+               insert_traversal_aabb_case(device, pCreateInfo, b, vars, &trav_vars, bvh_node);
             }
             nir_push_else(b, NULL);
             {



More information about the mesa-commit mailing list