Refactor: flatten light tree in recursive function #107560

Brecht Van Lommel · 2023-05-02T20:55:38+02:00

Brecht Van Lommel commented

2023-05-02 20:55:38 +02:00

This will make further changes for light linking easier, where we want to build multiple trees specialized for each light linking set.

I also find it easier to understand than the stack used previously.

This will make further changes for light linking easier, where we want to build multiple trees specialized for each light linking set. I also find it easier to understand than the stack used previously.

Brecht Van Lommel added 2 commits 2023-05-02 20:55:43 +02:00

Refactor: avoid storing parent_index, store only bit trail 0ab03682d4

Refactor: build light tree in recursive function

buildbot/vexp-code-patch-coordinator Build done.

Details

9c69504771

To make further refactoring for linking easier. Also replace parent_index
by directly storing bit_trail.

Brecht Van Lommel requested review from Weizhen Huang 2023-05-02 20:55:51 +02:00

Brecht Van Lommel referenced this pull request

2023-05-02 20:59:24 +02:00

Cycles: build specialized light trees for light linking #107561

Sergey Sharybin commented

2023-05-03 16:41:34 +02:00

@blender-bot build

Weizhen Huang added 2 commits 2023-05-05 14:46:00 +02:00

Swap instance and reference before flattening the subtree cfd7de83ac

Cleanup: remove noise in the comment 745ff1c3c9

Weizhen Huang approved these changes 2023-05-05 15:00:36 +02:00

Weizhen Huang left a comment

Looks great! The logic is indeed much more clear now.
There was problem in the logic: the instance node and the reference node should be swapped before flattening, otherwise it will not necessarily build the subtree first. I already commited the change in cfd7de83ac.
Otherwise only minor comments regarding the function names.

Looks great! The logic is indeed much more clear now. There was problem in the logic: the instance node and the reference node should be swapped before flattening, otherwise it will not necessarily build the subtree first. I already commited the change in cfd7de83ac. Otherwise only minor comments regarding the function names.

intern/cycles/scene/light.cpp Outdated

						
				@ -435,0 +445,4 @@

				  std::unordered_map<LightTreeNode *, int> instances;

				};

				static void light_tree_node_flatten(KernelLightTreeNode &knode,

Weizhen Huang commented

2023-05-05 14:49:03 +02:00

This is not a flatten operation, maybe call it something like copy_light_tree_node_to_device()?

This is not a flatten operation, maybe call it something like `copy_light_tree_node_to_device()`?

brecht marked this conversation as resolved

intern/cycles/scene/light.cpp Outdated

						
				@ -435,0 +478,4 @@

				                              KernelLightTreeEmitter *kemitters,

				                              int &next_node_index);

				static void light_tree_leaf_emitters_flatten(LightTreeFlatten &flatten,