blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Functions: make constant folding work on unfinished networks

This commit is contained in:
Jacques Lucke 2020-07-10 14:19:45 +02:00
parent 7bae599232
commit 295b3aefb0
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/functions/intern/multi_function_network_optimization.cc
View File

@ -142,6 +142,19 @@ void dead_node_removal(MFNetwork &network)
*
* \{ */
static Vector<MFNode *> find_non_constant_nodes(MFNetwork &network)
{
Vector<MFNode *> non_constant_nodes;
non_constant_nodes.extend(network.dummy_nodes());
for (MFFunctionNode *node : network.function_nodes()) {
if (!node->all_inputs_have_origin()) {
non_constant_nodes.append(node);
}
}
return non_constant_nodes;
}
static bool output_has_non_constant_target_node(MFOutputSocket *output_socket,
Span<bool> is_not_constant_mask)
{
@ -168,7 +181,7 @@ static MFInputSocket *try_find_dummy_target_socket(MFOutputSocket *output_socket
static Vector<MFInputSocket *> find_constant_inputs_to_fold(
MFNetwork &network, Vector<MFDummyNode *> &r_temporary_nodes)
{
Span<MFNode *> non_constant_nodes = network.dummy_nodes();
Vector<MFNode *> non_constant_nodes = find_non_constant_nodes(network);
Array<bool> is_not_constant_mask = mask_nodes_to_the_right(network, non_constant_nodes);
Vector<MFNode *> constant_nodes = find_nodes_based_on_mask(network, is_not_constant_mask, false);