From 318020df2bca678a81225fd2e9c8dc07cc9839c4 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 19 Jul 2022 21:50:44 +0300 Subject: [PATCH] intel/nir/rt: fix ray query proceed level Initially the level is world (top level), then it's whatever level the potential hit is. Signed-off-by: Lionel Landwerlin Fixes: c78be5da300ae3 ("intel/fs: lower ray query intrinsics") Reviewed-by: Ivan Briano Part-of: (cherry picked from commit 259b1647e63ae8c25730feb4e0190211938fa296) --- .pick_status.json | 2 +- src/intel/compiler/brw_nir_lower_ray_queries.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fcdd90172d3..95a52ca3ffb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1048,7 +1048,7 @@ "description": "intel/nir/rt: fix ray query proceed level", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c78be5da300ae386a12b91a22efb064335e2043a" }, diff --git a/src/intel/compiler/brw_nir_lower_ray_queries.c b/src/intel/compiler/brw_nir_lower_ray_queries.c index e2341dd83c3..bdbcc975376 100644 --- a/src/intel/compiler/brw_nir_lower_ray_queries.c +++ b/src/intel/compiler/brw_nir_lower_ray_queries.c @@ -311,7 +311,7 @@ lower_ray_query_intrinsic(nir_builder *b, update_trace_ctrl_level(b, ctrl_level_addr, NULL, NULL, nir_imm_int(b, GEN_RT_TRACE_RAY_CONTINUE), - nir_imm_int(b, BRW_RT_BVH_LEVEL_OBJECT)); + hit_in.bvh_level); not_done_then = nir_inot(b, hit_in.done); }