fix cuda rq

LuisaGroup · Jan 15, 2024 · 01103aa · 01103aa
1 parent bf5919b
commit 01103aa
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/src/base/geometry.cpp b/src/base/geometry.cpp
@@ -245,31 +245,37 @@ Var<Hit> Geometry::trace_closest(const Var<Ray> &ray_in) const noexcept {
         return Var<Hit>{hit.inst, hit.prim, hit.bary};
     }
     // use ray query
-    auto rq_hit =
-        _accel->traverse(ray_in, {})
-            .on_surface_candidate([&](compute::SurfaceCandidate &c) noexcept {
-                $if(!this->_alpha_skip(c.ray(), c.hit())) {
-                    c.commit();
-                };
-            })
-            .trace();
-    return Var<Hit>{rq_hit.inst, rq_hit.prim, rq_hit.bary};
+    Callable impl = [this](Var<Ray> ray) noexcept {
+        auto rq_hit =
+            _accel->traverse(ray, {})
+                .on_surface_candidate([&](compute::SurfaceCandidate &c) noexcept {
+                    $if(!this->_alpha_skip(c.ray(), c.hit())) {
+                        c.commit();
+                    };
+                })
+                .trace();
+        return Var<Hit>{rq_hit.inst, rq_hit.prim, rq_hit.bary};
+    };
+    return impl(ray_in);
 }
 
 Var<bool> Geometry::trace_any(const Var<Ray> &ray) const noexcept {
     if (!_any_non_opaque) {
         // happy path
         return _accel->intersect_any(ray, {});
     }
-    auto rq_hit =
-        _accel->traverse_any(ray, {})
-            .on_surface_candidate([&](compute::SurfaceCandidate &c) noexcept {
-                $if(!this->_alpha_skip(c.ray(), c.hit())) {
-                    c.commit();
-                };
-            })
-            .trace();
-    return !rq_hit->miss();
+    Callable impl = [this](Var<Ray> ray) noexcept {
+        auto rq_hit =
+            _accel->traverse_any(ray, {})
+                .on_surface_candidate([&](compute::SurfaceCandidate &c) noexcept {
+                    $if(!this->_alpha_skip(c.ray(), c.hit())) {
+                        c.commit();
+                    };
+                })
+                .trace();
+        return !rq_hit->miss();
+    };
+    return impl(ray);
 }
 
 luisa::shared_ptr<Interaction> Geometry::interaction(Expr<uint> inst_id, Expr<uint> prim_id,

diff --git a/src/compute b/src/compute
+2 −0		include/luisa/ast/function_builder.h
+4 −0		src/ast/function_builder.cpp
+13 −9		src/backends/cuda/cuda_codegen_ast.cpp
+1 −1		src/ext/magic_enum
+1 −1		src/ext/spdlog
+29 −9		src/ir/ir2ast.cpp