Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/depsgraph/intern/eval/deg_eval.cc
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/depsgraph/intern/eval/deg_eval.cc')
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval.cc78
1 files changed, 35 insertions, 43 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index 02d286c3bd1..0425407d1cd 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -38,6 +38,8 @@
#include "BLI_task.h"
#include "BLI_ghash.h"
+#include "BKE_global.h"
+
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
@@ -49,15 +51,12 @@
#include "intern/eval/deg_eval_copy_on_write.h"
#include "intern/eval/deg_eval_flush.h"
#include "intern/eval/deg_eval_stats.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 "intern/nodes/deg_node_time.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"
+#include "intern/node/deg_node_time.h"
#include "intern/depsgraph.h"
-#include "intern/depsgraph_intern.h"
-
-#include "util/deg_util_foreach.h"
namespace DEG {
@@ -67,7 +66,7 @@ namespace DEG {
/* Forward declarations. */
static void schedule_children(TaskPool *pool,
Depsgraph *graph,
- OperationDepsNode *node,
+ OperationNode *node,
const int thread_id);
struct DepsgraphEvalState {
@@ -82,7 +81,7 @@ static void deg_task_run_func(TaskPool *pool,
{
void *userdata_v = BLI_task_pool_userdata(pool);
DepsgraphEvalState *state = (DepsgraphEvalState *)userdata_v;
- OperationDepsNode *node = (OperationDepsNode *)taskdata;
+ OperationNode *node = (OperationNode *)taskdata;
/* Sanity checks. */
BLI_assert(!node->is_noop() && "NOOP nodes should not actually be scheduled");
/* Perform operation. */
@@ -104,13 +103,12 @@ typedef struct CalculatePendingData {
Depsgraph *graph;
} CalculatePendingData;
-static bool check_operation_node_visible(OperationDepsNode *op_node)
+static bool check_operation_node_visible(OperationNode *op_node)
{
- const ComponentDepsNode *comp_node = op_node->owner;
+ const ComponentNode *comp_node = op_node->owner;
/* Special exception, copy on write component is to be always evaluated,
- * to keep copied "database" in a consistent state.
- */
- if (comp_node->type == DEG_NODE_TYPE_COPY_ON_WRITE) {
+ * to keep copied "database" in a consistent state. */
+ if (comp_node->type == NodeType::COPY_ON_WRITE) {
return true;
}
return comp_node->affects_directly_visible;
@@ -123,7 +121,7 @@ static void calculate_pending_func(
{
CalculatePendingData *data = (CalculatePendingData *)data_v;
Depsgraph *graph = data->graph;
- OperationDepsNode *node = graph->operations[i];
+ OperationNode *node = graph->operations[i];
/* Update counters, applies for both visible and invisible IDs. */
node->num_links_pending = 0;
node->scheduled = false;
@@ -135,16 +133,15 @@ static void calculate_pending_func(
if ((node->flag & DEPSOP_FLAG_NEEDS_UPDATE) == 0) {
return;
}
- foreach (DepsRelation *rel, node->inlinks) {
- if (rel->from->type == DEG_NODE_TYPE_OPERATION &&
- (rel->flag & DEPSREL_FLAG_CYCLIC) == 0)
+ for (Relation *rel : node->inlinks) {
+ if (rel->from->type == NodeType::OPERATION &&
+ (rel->flag & RELATION_FLAG_CYCLIC) == 0)
{
- OperationDepsNode *from = (OperationDepsNode *)rel->from;
+ OperationNode *from = (OperationNode *)rel->from;
/* TODO(sergey): This is how old layer system was checking for the
* calculation, but how is it possible that visible object depends
* on an invisible? This is something what is prohibited after
- * deg_graph_build_flush_layers().
- */
+ * deg_graph_build_flush_layers(). */
if (!check_operation_node_visible(from)) {
continue;
}
@@ -177,7 +174,7 @@ static void initialize_execution(DepsgraphEvalState *state, Depsgraph *graph)
const bool do_stats = state->do_stats;
calculate_pending_parents(graph);
/* Clear tags and other things which needs to be clear. */
- foreach (OperationDepsNode *node, graph->operations) {
+ for (OperationNode *node : graph->operations) {
if (do_stats) {
node->stats.reset_current();
}
@@ -189,7 +186,7 @@ static void initialize_execution(DepsgraphEvalState *state, Depsgraph *graph)
* scheduled after a task has been completed.
*/
static void schedule_node(TaskPool *pool, Depsgraph *graph,
- OperationDepsNode *node, bool dec_parents,
+ OperationNode *node, bool dec_parents,
const int thread_id)
{
/* No need to schedule nodes of invisible ID. */
@@ -197,33 +194,30 @@ static void schedule_node(TaskPool *pool, Depsgraph *graph,
return;
}
/* No need to schedule operations which are not tagged for update, they are
- * considered to be up to date.
- */
+ * considered to be up to date. */
if ((node->flag & DEPSOP_FLAG_NEEDS_UPDATE) == 0) {
return;
}
/* TODO(sergey): This is not strictly speaking safe to read
- * num_links_pending.
- */
+ * num_links_pending. */
if (dec_parents) {
BLI_assert(node->num_links_pending > 0);
atomic_sub_and_fetch_uint32(&node->num_links_pending, 1);
}
/* Cal not schedule operation while its dependencies are not yet
- * evaluated.
- */
+ * evaluated. */
if (node->num_links_pending != 0) {
return;
}
/* During the COW stage only schedule COW nodes. */
DepsgraphEvalState *state = (DepsgraphEvalState *)BLI_task_pool_userdata(pool);
if (state->is_cow_stage) {
- if (node->owner->type != DEG_NODE_TYPE_COPY_ON_WRITE) {
+ if (node->owner->type != NodeType::COPY_ON_WRITE) {
return;
}
}
else {
- BLI_assert(node->scheduled || node->owner->type != DEG_NODE_TYPE_COPY_ON_WRITE);
+ BLI_assert(node->scheduled || node->owner->type != NodeType::COPY_ON_WRITE);
}
/* Actually schedule the node. */
bool is_scheduled = atomic_fetch_and_or_uint8(
@@ -247,19 +241,19 @@ static void schedule_node(TaskPool *pool, Depsgraph *graph,
static void schedule_graph(TaskPool *pool, Depsgraph *graph)
{
- foreach (OperationDepsNode *node, graph->operations) {
+ for (OperationNode *node : graph->operations) {
schedule_node(pool, graph, node, false, 0);
}
}
static void schedule_children(TaskPool *pool,
Depsgraph *graph,
- OperationDepsNode *node,
+ OperationNode *node,
const int thread_id)
{
- foreach (DepsRelation *rel, node->outlinks) {
- OperationDepsNode *child = (OperationDepsNode *)rel->to;
- BLI_assert(child->type == DEG_NODE_TYPE_OPERATION);
+ for (Relation *rel : node->outlinks) {
+ OperationNode *child = (OperationNode *)rel->to;
+ BLI_assert(child->type == NodeType::OPERATION);
if (child->scheduled) {
/* Happens when having cyclic dependencies. */
continue;
@@ -267,7 +261,7 @@ static void schedule_children(TaskPool *pool,
schedule_node(pool,
graph,
child,
- (rel->flag & DEPSREL_FLAG_CYCLIC) == 0,
+ (rel->flag & RELATION_FLAG_CYCLIC) == 0,
thread_id);
}
}
@@ -277,13 +271,12 @@ static void depsgraph_ensure_view_layer(Depsgraph *graph)
/* We update copy-on-write scene in the following cases:
* - It was not expanded yet.
* - It was tagged for update of CoW component.
- * This allows us to have proper view layer pointer.
- */
+ * This allows us to have proper view layer pointer. */
Scene *scene_cow = graph->scene_cow;
if (!deg_copy_on_write_is_expanded(&scene_cow->id) ||
scene_cow->id.recalc & ID_RECALC_COPY_ON_WRITE)
{
- const IDDepsNode *id_node = graph->find_id_node(&graph->scene->id);
+ const IDNode *id_node = graph->find_id_node(&graph->scene->id);
deg_update_copy_on_write_datablock(graph, id_node);
}
}
@@ -335,8 +328,7 @@ void deg_evaluate_on_refresh(Depsgraph *graph)
BLI_task_pool_free(task_pool);
/* Finalize statistics gathering. This is because we only gather single
* operation timing here, without aggregating anything to avoid any extra
- * synchronization.
- */
+ * synchronization. */
if (state.do_stats) {
deg_eval_stats_aggregate(graph);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-13 17:05:45 +0300