cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwFlowNet.cpp,cwFlowTypes.h : Added network_t.poly_proc_idxA[] to prepare for parallel poly's

Browse Source
This commit is contained in:
kevin 2024-09-13 15:32:25 -04:00
parent e0063a078f
commit af49ef42cb
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cwFlowNet.cpp
View File

@ -131,6 +131,7 @@ namespace cw
for(unsigned i=0; i<net.proc_arrayN; ++i) for(unsigned i=0; i<net.proc_arrayN; ++i)
proc_destroy(net.proc_array[i]); proc_destroy(net.proc_array[i]);
mem::release(net.poly_proc_idxA);
mem::release(net.proc_array); mem::release(net.proc_array);
net.proc_arrayAllocN = 0; net.proc_arrayAllocN = 0;
net.proc_arrayN = 0; net.proc_arrayN = 0;
@ -2899,9 +2900,18 @@ cw::rc_t cw::flow::network_create( flow_t* p,
net.proc_arrayAllocN = polyCnt * net.procsCfg->child_count(); net.proc_arrayAllocN = polyCnt * net.procsCfg->child_count();
net.proc_array = mem::allocZ<proc_t*>(net.proc_arrayAllocN); net.proc_array = mem::allocZ<proc_t*>(net.proc_arrayAllocN);
net.proc_arrayN = 0; net.proc_arrayN = 0;
net.poly_proc_idxA = orderId == kNetFirstPolyOrderId ? mem::allocZ<unsigned>(polyCnt) : nullptr;
for(unsigned i=0; i<outerN; ++i) for(unsigned i=0; i<outerN; ++i)
{ {
// if this network is running in 'network-first' order then track the location of
// the first proc in each network
if( net.poly_proc_idxA != nullptr )
{
assert( i<polyCnt && net.proc_arrayN < net.proc_arrayAllocN );
net.poly_proc_idxA[i] = net.proc_arrayN;
}
// for each proc in the network // for each proc in the network
for(unsigned j=0; j<net.procsCfg->child_count(); ++j) for(unsigned j=0; j<net.procsCfg->child_count(); ++j)
{ {

2
cwFlowTypes.h
View File

@ -321,6 +321,8 @@ namespace cw
{ {
const object_t* procsCfg; // network proc list const object_t* procsCfg; // network proc list
const object_t* presetsCfg; // presets designed for this network const object_t* presetsCfg; // presets designed for this network
unsigned* poly_proc_idxA; // poly_proc_idxA[ poly_cnt ]. Index into proc_array[] of first proc in each network
unsigned poly_cnt; // count of duplicated networks in the list unsigned poly_cnt; // count of duplicated networks in the list
struct proc_str** proc_array; struct proc_str** proc_array;