Properly handle single node case

sergcpp · Aug 23, 2024 · fcb7097 · fcb7097
1 parent bd59cf5
commit fcb7097
Show file tree

Hide file tree

Showing 23 changed files with 75 additions and 65 deletions.
diff --git a/internal/SceneCPU.cpp b/internal/SceneCPU.cpp
@@ -1432,7 +1432,12 @@ void Ray::Cpu::Scene::RebuildLightTree_nolock() {
         (void)root_node;
         light_nodes_.clear();
 
-        // Collapse leaf level (all nodes have only 1 child)
+        // Collapse leaf level (all leafs have only 1 light)
+        if ((light_wnodes_[0].child[0] & LEAF_NODE_BIT) != 0) {
+            for (int j = 1; j < 8; ++j) {
+                light_wnodes_[0].child[j] = 0x7fffffff;
+            }
+        }
         std::vector<bool> should_remove(light_wnodes_.size(), false);
         for (uint32_t i = 0; i < light_wnodes_.size(); ++i) {
             if ((light_wnodes_[i].child[0] & LEAF_NODE_BIT) == 0) {

diff --git a/internal/SceneGPU.h b/internal/SceneGPU.h
@@ -2450,7 +2450,12 @@ inline void Ray::NS::Scene::RebuildLightTree_nolock() {
     assert(root_node == 0);
     (void)root_node;
 
-    // Collapse leaf level (all nodes have only 1 child)
+    // Collapse leaf level (all leafs have only 1 light)
+    if ((temp_light_wnodes[0].child[0] & LEAF_NODE_BIT) != 0) {
+        for (int j = 1; j < 8; ++j) {
+            temp_light_wnodes[0].child[j] = 0x7fffffff;
+        }
+    }
     std::vector<bool> should_remove(temp_light_wnodes.size(), false);
     for (uint32_t i = 0; i < temp_light_wnodes.size(); ++i) {
         if ((temp_light_wnodes[i].child[0] & LEAF_NODE_BIT) == 0) {

diff --git a/internal/shaders/output/shade_secondary_atlas.comp.cso.inl b/internal/shaders/output/shade_secondary_atlas.comp.cso.inl
diff --git a/internal/shaders/output/shade_secondary_atlas.comp.spv.inl b/internal/shaders/output/shade_secondary_atlas.comp.spv.inl
diff --git a/internal/shaders/output/shade_secondary_atlas_cache_query.comp.cso.inl b/internal/shaders/output/shade_secondary_atlas_cache_query.comp.cso.inl
diff --git a/internal/shaders/output/shade_secondary_atlas_cache_query.comp.spv.inl b/internal/shaders/output/shade_secondary_atlas_cache_query.comp.spv.inl
diff --git a/internal/shaders/output/shade_secondary_atlas_cache_query_sky.comp.cso.inl b/internal/shaders/output/shade_secondary_atlas_cache_query_sky.comp.cso.inl
diff --git a/internal/shaders/output/shade_secondary_atlas_cache_query_sky.comp.spv.inl b/internal/shaders/output/shade_secondary_atlas_cache_query_sky.comp.spv.inl
diff --git a/internal/shaders/output/shade_secondary_atlas_cache_update.comp.cso.inl b/internal/shaders/output/shade_secondary_atlas_cache_update.comp.cso.inl
diff --git a/internal/shaders/output/shade_secondary_atlas_cache_update.comp.spv.inl b/internal/shaders/output/shade_secondary_atlas_cache_update.comp.spv.inl
diff --git a/internal/shaders/output/shade_secondary_atlas_sky.comp.cso.inl b/internal/shaders/output/shade_secondary_atlas_sky.comp.cso.inl
diff --git a/internal/shaders/output/shade_secondary_atlas_sky.comp.spv.inl b/internal/shaders/output/shade_secondary_atlas_sky.comp.spv.inl
diff --git a/internal/shaders/output/shade_secondary_bindless.comp.cso.inl b/internal/shaders/output/shade_secondary_bindless.comp.cso.inl
diff --git a/internal/shaders/output/shade_secondary_bindless.comp.spv.inl b/internal/shaders/output/shade_secondary_bindless.comp.spv.inl
diff --git a/internal/shaders/output/shade_secondary_bindless_cache_query.comp.cso.inl b/internal/shaders/output/shade_secondary_bindless_cache_query.comp.cso.inl
diff --git a/internal/shaders/output/shade_secondary_bindless_cache_query.comp.spv.inl b/internal/shaders/output/shade_secondary_bindless_cache_query.comp.spv.inl
diff --git a/internal/shaders/output/shade_secondary_bindless_cache_query_sky.comp.cso.inl b/internal/shaders/output/shade_secondary_bindless_cache_query_sky.comp.cso.inl
diff --git a/internal/shaders/output/shade_secondary_bindless_cache_query_sky.comp.spv.inl b/internal/shaders/output/shade_secondary_bindless_cache_query_sky.comp.spv.inl
diff --git a/internal/shaders/output/shade_secondary_bindless_cache_update.comp.cso.inl b/internal/shaders/output/shade_secondary_bindless_cache_update.comp.cso.inl
diff --git a/internal/shaders/output/shade_secondary_bindless_cache_update.comp.spv.inl b/internal/shaders/output/shade_secondary_bindless_cache_update.comp.spv.inl
diff --git a/internal/shaders/output/shade_secondary_bindless_sky.comp.cso.inl b/internal/shaders/output/shade_secondary_bindless_sky.comp.cso.inl
diff --git a/internal/shaders/output/shade_secondary_bindless_sky.comp.spv.inl b/internal/shaders/output/shade_secondary_bindless_sky.comp.spv.inl
diff --git a/internal/shaders/shade.comp.glsl b/internal/shaders/shade.comp.glsl
@@ -1315,9 +1315,9 @@ float EvalTriLightFactor(const vec3 P, const vec3 ro, uint tri_index) {
         const uint cur = g_stack[gl_LocalInvocationIndex][--stack_size];
         const float cur_factor = g_stack_factors[gl_LocalInvocationIndex][stack_size];
 
-        light_wbvh_node_t n = g_light_wnodes[cur];
+        if ((cur & LEAF_NODE_BIT) == 0) {
+            light_wbvh_node_t n = g_light_wnodes[cur];
 
-        if ((n.child[0] & LEAF_NODE_BIT) == 0) {
             float importance[8];
             const float total_importance = calc_lnode_importance(n, ro, importance);
 
@@ -1329,7 +1329,7 @@ float EvalTriLightFactor(const vec3 P, const vec3 ro, uint tri_index) {
                 }
             }
         } else {
-            const int light_index = int(n.child[0] & PRIM_INDEX_BITS);
+            const int light_index = int(cur & PRIM_INDEX_BITS);
 
             light_t l = g_lights[light_index];
             if (LIGHT_TYPE(l) == LIGHT_TYPE_TRI && floatBitsToUint(l.TRI_TRI_INDEX) == tri_index) {