fix disney

LuisaGroup · Sep 11, 2023 · 6b82b94 · 6b82b94
1 parent 4e72bdc
commit 6b82b94
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/compute b/src/compute
diff --git a/src/surfaces/disney.cpp b/src/surfaces/disney.cpp
@@ -550,7 +550,7 @@ class DisneyClosureImpl : public DisneyClosureImplBase {
         // sample
         auto wo_local = _ctx.it.shading().world_to_local(wo);
         auto event = def(Surface::event_reflect);
-        BxDF::SampledDirection wi_sample;
+        BxDF::SampledDirection wi_sample{.valid = false};
         $switch(sampling_tech) {
             if (_diffuse) {
                 $case(diffuse_like_technique_index) {
@@ -573,7 +573,6 @@ class DisneyClosureImpl : public DisneyClosureImplBase {
                     event = ite(cos_theta(wo_local) > 0.f, Surface::event_enter, Surface::event_exit);
                 };
             }
-            $default { unreachable(); };
         };
         auto eval = Surface::Evaluation::zero(_ctx.color.dimension());
         auto wi = _ctx.it.shading().local_to_world(wi_sample.wi);
@@ -798,7 +797,7 @@ class ThinDisneyClosureImpl : public DisneyClosureImplBase {
         // sample
         auto wo_local = _ctx.it.shading().world_to_local(wo);
         auto event = def(Surface::event_reflect);
-        BxDF::SampledDirection wi_sample;
+        BxDF::SampledDirection wi_sample{.valid = false};
         $switch(sampling_tech) {
             if (_diffuse) {
                 $case(diffuse_like_technique_index) {
@@ -827,7 +826,6 @@ class ThinDisneyClosureImpl : public DisneyClosureImplBase {
                     event = Surface::event_through;
                 };
             }
-            $default { unreachable(); };
         };
         auto eval = Surface::Evaluation::zero(_ctx.color.dimension());
         auto wi = _ctx.it.shading().local_to_world(wi_sample.wi);

diff --git a/src/util/polymorphic_closure.h b/src/util/polymorphic_closure.h
@@ -91,7 +91,8 @@ class PolymorphicCall {
                         _closures[i]->post_eval();
                     };
                 }
-                compute::detail::SwitchDefaultStmtBuilder{} % compute::unreachable;
+                compute::detail::SwitchDefaultStmtBuilder{} %
+                    [] { compute::unreachable(); };
             };
         }
     }
+22 −0		include/luisa/ast/expression.h
+2 −0		include/luisa/ast/function_builder.h
+5 −0		include/luisa/dsl/builtin.h
+6 −4		include/luisa/dsl/polymorphic.h
+49 −6		include/luisa/dsl/stmt.h
+58 −19		include/luisa/dsl/sugar.h
+7 −1		include/luisa/rust/ir.hpp
+4 −0		src/ast/ast2json.cpp
+5 −0		src/ast/expression.cpp
+4 −0		src/ast/function_builder.cpp
+1 −0		src/backends/common/hlsl/hlsl_codegen.h
+16 −5		src/backends/common/vulkan_swapchain.cpp
+14 −6		src/backends/cuda/cuda_builtin/cuda_device_resource.h
+5,742 −5,717		src/backends/cuda/cuda_builtin_embedded.cpp
+1 −1		src/backends/cuda/cuda_builtin_embedded.h
+8 −0		src/backends/cuda/cuda_codegen_ast.cpp
+1 −0		src/backends/cuda/cuda_codegen_ast.h
+6 −1		src/backends/cuda/cuda_device.cpp
+4 −0		src/backends/metal/metal_codegen_ast.cpp
+1 −0		src/backends/metal/metal_codegen_ast.h
+3 −2		src/core/platform.cpp
+1 −0		src/dsl/CMakeLists.txt
+12 −0		src/dsl/sugar.cpp
+33 −8		src/rust/luisa_compute_ir/src/ast2ir.rs