Mesa (main): radv: Do not discard hits with t=tmax

[GitLab Mirror]

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

Author: Konstantin Seurer <konstantin.seurer at gmail.com>
Date:   Tue Apr 19 16:13:28 2022 +0200

radv: Do not discard hits with t=tmax

Fixes dEQP-VK.ray_tracing_pipeline.inside_aabbs.chit.ray_end_tmax_zero.*

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

---

 src/amd/vulkan/radv_nir_lower_ray_queries.c | 6 +++---
 src/amd/vulkan/radv_pipeline_rt.c           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/amd/vulkan/radv_nir_lower_ray_queries.c b/src/amd/vulkan/radv_nir_lower_ray_queries.c
index 37a214eb784..b5567de0bc0 100644
--- a/src/amd/vulkan/radv_nir_lower_ray_queries.c
+++ b/src/amd/vulkan/radv_nir_lower_ray_queries.c
@@ -322,7 +322,7 @@ static void
 lower_rq_generate_intersection(nir_builder *b, nir_ssa_def *index, nir_intrinsic_instr *instr,
                                struct ray_query_vars *vars)
 {
-   nir_push_if(b, nir_iand(b, nir_flt(b, instr->src[1].ssa, rq_load_var(b, index, vars->closest.t)),
+   nir_push_if(b, nir_iand(b, nir_fge(b, rq_load_var(b, index, vars->closest.t), instr->src[1].ssa),
                            nir_fge(b, instr->src[1].ssa, rq_load_var(b, index, vars->tmin))));
    {
       copy_candidate_to_closest(b, index, vars);
@@ -538,7 +538,7 @@ insert_traversal_triangle_case(struct radv_device *device, nir_builder *b, nir_s
                      0)));
 
    nir_push_if(b, nir_iand(b,
-                           nir_iand(b, nir_flt(b, dist, rq_load_var(b, index, vars->closest.t)),
+                           nir_iand(b, nir_fge(b, rq_load_var(b, index, vars->closest.t), dist),
                                     nir_fge(b, dist, rq_load_var(b, index, vars->tmin))),
                            not_cull));
    {
@@ -635,7 +635,7 @@ insert_traversal_aabb_case(struct radv_device *device, nir_builder *b, nir_ssa_d
       nir_ssa_def *t_max = nir_fmin(b, nir_channel(b, t2_vec, 0), nir_channel(b, t2_vec, 1));
       t_max = nir_fmin(b, t_max, nir_channel(b, t2_vec, 2));
 
-      nir_push_if(b, nir_iand(b, nir_flt(b, t_min, rq_load_var(b, index, vars->closest.t)),
+      nir_push_if(b, nir_iand(b, nir_fge(b, rq_load_var(b, index, vars->closest.t), t_min),
                               nir_fge(b, t_max, rq_load_var(b, index, vars->tmin))));
       {
          rq_store_var(b, index, vars->candidate.t,
diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c
index b550f7e6f3b..07a4106e5cc 100644
--- a/src/amd/vulkan/radv_pipeline_rt.c
+++ b/src/amd/vulkan/radv_pipeline_rt.c
@@ -642,7 +642,7 @@ lower_rt_instructions(nir_shader *shader, struct rt_variables *vars, unsigned ca
                   &b_shader,
                   nir_iand(
                      &b_shader,
-                     nir_flt(&b_shader, intr->src[0].ssa, nir_load_var(&b_shader, vars->tmax)),
+                     nir_fge(&b_shader, nir_load_var(&b_shader, vars->tmax), intr->src[0].ssa),
                      nir_fge(&b_shader, intr->src[0].ssa, nir_load_var(&b_shader, vars->tmin))));
                {
                   nir_store_var(&b_shader, vars->ahit_status, nir_imm_int(&b_shader, 0), 1);
@@ -1112,7 +1112,7 @@ insert_traversal_triangle_case(struct radv_device *device,
                      0)));
 
    nir_push_if(b, nir_iand(b,
-                           nir_iand(b, nir_flt(b, dist, nir_load_var(b, vars->tmax)),
+                           nir_iand(b, nir_fge(b, nir_load_var(b, vars->tmax), dist),
                                     nir_fge(b, dist, nir_load_var(b, vars->tmin))),
                            not_cull));
    {
@@ -1319,7 +1319,7 @@ insert_traversal_aabb_case(struct radv_device *device,
          nir_ssa_def *t_max = nir_fmin(b, nir_channel(b, t2_vec, 0), nir_channel(b, t2_vec, 1));
          t_max = nir_fmin(b, t_max, nir_channel(b, t2_vec, 2));
 
-         nir_push_if(b, nir_iand(b, nir_flt(b, t_min, nir_load_var(b, vars->tmax)),
+         nir_push_if(b, nir_iand(b, nir_fge(b, nir_load_var(b, vars->tmax), t_min),
                                  nir_fge(b, t_max, nir_load_var(b, vars->tmin))));
          {
             nir_store_var(b, vars->ahit_status, nir_imm_int(b, 0), 1);