diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-01-31 14:56:40 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-01-31 16:31:41 +0300 |
commit | c1da8e3b28f95188f9e9152383856c95f29586b4 (patch) | |
tree | 611acd206bfb126f076e78caa047b14bcd3673b6 /source/blender/depsgraph/intern/eval/deg_eval_stats.cc | |
parent | 7ccef23c4d010d4b4f83efe2cd6c82ff26824a10 (diff) |
Depsgraph: Comb code to a better state all over
Some summary of changes:
- Don't use DEG prefix for types and enumerator values:
the code is already inside DEG namespace.
- Put code where it locally belongs to: avoid having one
single header file with all sort of definitions in it.
- Take advantage of modern C++11 enabled by default.
Diffstat (limited to 'source/blender/depsgraph/intern/eval/deg_eval_stats.cc')
-rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_stats.cc | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc index 52ce744cc0a..4dae608bae8 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc @@ -35,23 +35,20 @@ #include "intern/depsgraph.h" -#include "intern/nodes/deg_node.h" -#include "intern/nodes/deg_node_component.h" -#include "intern/nodes/deg_node_id.h" -#include "intern/nodes/deg_node_operation.h" - -#include "util/deg_util_foreach.h" +#include "intern/node/deg_node.h" +#include "intern/node/deg_node_component.h" +#include "intern/node/deg_node_id.h" +#include "intern/node/deg_node_operation.h" namespace DEG { void deg_eval_stats_aggregate(Depsgraph *graph) { /* Reset current evaluation stats for ID and component nodes. - * Those are not filled in by the evaluation engine. - */ - foreach (DepsNode *node, graph->id_nodes) { - IDDepsNode *id_node = (IDDepsNode *)node; - GHASH_FOREACH_BEGIN(ComponentDepsNode *, comp_node, id_node->components) + * Those are not filled in by the evaluation engine. */ + for (Node *node : graph->id_nodes) { + IDNode *id_node = (IDNode *)node; + GHASH_FOREACH_BEGIN(ComponentNode *, comp_node, id_node->components) { comp_node->stats.reset_current(); } @@ -59,9 +56,9 @@ void deg_eval_stats_aggregate(Depsgraph *graph) id_node->stats.reset_current(); } /* Now accumulate operation timings to components and IDs. */ - foreach (OperationDepsNode *op_node, graph->operations) { - ComponentDepsNode *comp_node = op_node->owner; - IDDepsNode *id_node = comp_node->owner; + for (OperationNode *op_node : graph->operations) { + ComponentNode *comp_node = op_node->owner; + IDNode *id_node = comp_node->owner; id_node->stats.current_time += op_node->stats.current_time; comp_node->stats.current_time += op_node->stats.current_time; } |