[Bf-blender-cvs] [b5eb6548d1e] master: Depsgraph: Remove filtering API
Sergey Sharybin
noreply at git.blender.org
Fri May 3 12:57:57 CEST 2019
Commit: b5eb6548d1e7f8c01d84e4949ce614c83c7174c8
Author: Sergey Sharybin
Date: Fri May 3 12:39:12 2019 +0200
Branches: master
https://developer.blender.org/rBb5eb6548d1e7f8c01d84e4949ce614c83c7174c8
Depsgraph: Remove filtering API
This was an attempt to speed up motion path calculation, which didn't
really work in real world animation files, where animators already
hide and disable all the heavy collections. Filtering approach also
doesn't allow to have multiple frames evaluated in multiple threads
easily.
Filtering also adds extra complexity on keeping the graph in a correct
and consistent state.
Fixes T64057: Blender crash when use motion paths
===================================================================
M source/blender/depsgraph/CMakeLists.txt
M source/blender/depsgraph/DEG_depsgraph_query.h
D source/blender/depsgraph/intern/depsgraph_query_filter.cc
M source/blender/editors/armature/pose_edit.c
===================================================================
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index aee925ad8f8..ba6b3b32d60 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -69,7 +69,6 @@ set(SRC
intern/depsgraph_eval.cc
intern/depsgraph_physics.cc
intern/depsgraph_query.cc
- intern/depsgraph_query_filter.cc
intern/depsgraph_query_foreach.cc
intern/depsgraph_query_iter.cc
intern/depsgraph_tag.cc
diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h
index 89e4958eddc..78434411a22 100644
--- a/source/blender/depsgraph/DEG_depsgraph_query.h
+++ b/source/blender/depsgraph/DEG_depsgraph_query.h
@@ -20,7 +20,7 @@
/** \file
* \ingroup depsgraph
*
- * Public API for Querying and Filtering Depsgraph.
+ * Public API for Querying Depsgraph.
*/
#ifndef __DEG_DEPSGRAPH_QUERY_H__
@@ -205,38 +205,6 @@ void DEG_foreach_dependent_ID(const Depsgraph *depsgraph,
void DEG_foreach_ID(const Depsgraph *depsgraph, DEGForeachIDCallback callback, void *user_data);
-/* ********************* DEG graph filtering ****************** */
-
-/* ComponentKey for nodes we want to be able to evaluate in the filtered graph */
-typedef struct DEG_FilterTarget {
- struct DEG_FilterTarget *next, *prev;
-
- struct ID *id;
- /* TODO: component identifiers - Component Type, Subdata/Component Name */
-} DEG_FilterTarget;
-
-typedef enum eDEG_FilterQuery_Granularity {
- DEG_FILTER_NODES_ALL = 0,
- DEG_FILTER_NODES_NO_OPS = 1,
- DEG_FILTER_NODES_ID_ONLY = 2,
-} eDEG_FilterQuery_Granularity;
-
-typedef struct DEG_FilterQuery {
- /* List of DEG_FilterTarget's */
- struct ListBase targets;
-
- /* Level of detail in the resulting graph */
- eDEG_FilterQuery_Granularity detail_level;
-} DEG_FilterQuery;
-
-/* Obtain a new graph instance that only contains the subset of desired nodes
- * WARNING: Do NOT pass an already filtered depsgraph through this function again,
- * as we are currently unable to accurately recreate it.
- */
-Depsgraph *DEG_graph_filter(const Depsgraph *depsgraph,
- struct Main *bmain,
- DEG_FilterQuery *query);
-
#ifdef __cplusplus
} /* extern "C" */
#endif
diff --git a/source/blender/depsgraph/intern/depsgraph_query_filter.cc b/source/blender/depsgraph/intern/depsgraph_query_filter.cc
deleted file mode 100644
index a02ced286eb..00000000000
--- a/source/blender/depsgraph/intern/depsgraph_query_filter.cc
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2018 Blender Foundation.
- * All rights reserved.
- */
-
-/** \file
- * \ingroup depsgraph
- *
- * Implementation of Graph Filtering API
- */
-
-#include "MEM_guardedalloc.h"
-
-extern "C" {
-#include <string.h> // XXX: memcpy
-
-#include "BLI_utildefines.h"
-#include "BKE_idcode.h"
-#include "BKE_main.h"
-#include "BLI_listbase.h"
-#include "BLI_ghash.h"
-
-#include "BKE_action.h" // XXX: BKE_pose_channel_from_name
-} /* extern "C" */
-
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
-#include "RNA_access.h"
-
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
-#include "DEG_depsgraph_debug.h"
-
-#include "intern/eval/deg_eval_copy_on_write.h"
-
-#include "intern/depsgraph.h"
-#include "intern/depsgraph_type.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"
-
-/* *************************************************** */
-/* Graph Filtering Internals */
-
-namespace DEG {
-
-/* UserData for deg_add_retained_id_cb */
-struct RetainedIdUserData {
- DEG_FilterQuery *query;
- GSet *set;
-};
-
-/* Helper for DEG_foreach_ancestor_id()
- * Keep track of all ID's encountered in a set
- */
-static void deg_add_retained_id_cb(ID *id, void *user_data)
-{
- RetainedIdUserData *data = (RetainedIdUserData *)user_data;
- BLI_gset_add(data->set, (void *)id);
-}
-
-/* ------------------------------------------- */
-
-/* Remove relations pointing to the given OperationNode */
-/* TODO: Make this part of OperationNode? */
-static void deg_unlink_opnode(Depsgraph *graph, OperationNode *op_node)
-{
- vector<Relation *> all_links;
-
- /* Collect all inlinks to this operation */
- for (Relation *rel : op_node->inlinks) {
- all_links.push_back(rel);
- }
- /* Collect all outlinks from this operation */
- for (Relation *rel : op_node->outlinks) {
- all_links.push_back(rel);
- }
-
- /* Delete all collected relations */
- for (Relation *rel : all_links) {
- rel->unlink();
- OBJECT_GUARDED_DELETE(rel, Relation);
- }
-
- /* Remove from entry tags */
- if (BLI_gset_haskey(graph->entry_tags, op_node)) {
- BLI_gset_remove(graph->entry_tags, op_node, NULL);
- }
-}
-
-/* Remove every ID Node (and its associated subnodes, COW data) */
-static void deg_filter_remove_unwanted_ids(Depsgraph *graph, GSet *retained_ids)
-{
- /* 1) First pass over ID nodes + their operations
- * - Identify and tag ID's (via "custom_flags = 1") to be removed
- * - Remove all links to/from operations that will be removed. */
- for (IDNode *id_node : graph->id_nodes) {
- id_node->custom_flags = !BLI_gset_haskey(retained_ids, (void *)id_node->id_orig);
- if (id_node->custom_flags) {
- GHASH_FOREACH_BEGIN (ComponentNode *, comp_node, id_node->components) {
- for (OperationNode *op_node : comp_node->operations) {
- deg_unlink_opnode(graph, op_node);
- }
- }
- GHASH_FOREACH_END();
- }
- }
-
- /* 2) Remove unwanted operations from graph->operations */
- for (Depsgraph::OperationNodes::iterator it_opnode = graph->operations.begin();
- it_opnode != graph->operations.end();) {
- OperationNode *op_node = *it_opnode;
- IDNode *id_node = op_node->owner->owner;
- if (id_node->custom_flags) {
- it_opnode = graph->operations.erase(it_opnode);
- }
- else {
- ++it_opnode;
- }
- }
-
- /* Free ID nodes that are no longer wanted
- *
- * This is loosely based on Depsgraph::clear_id_nodes().
- * However, we don't worry about the conditional freeing for physics
- * stuff, since it's rarely needed currently. */
- for (Depsgraph::IDDepsNodes::iterator it_id = graph->id_nodes.begin();
- it_id != graph->id_nodes.end();) {
- IDNode *id_node = *it_id;
- ID *id = id_node->id_orig;
-
- if (id_node->custom_flags) {
- /* Destroy node data, then remove from collections, and free */
- id_node->destroy();
-
- BLI_ghash_remove(graph->id_hash, id, NULL, NULL);
- it_id = graph->id_nodes.erase(it_id);
-
- OBJECT_GUARDED_DELETE(id_node, IDNode);
- }
- else {
- /* This node has not been marked for deletion. Increment iterator */
- ++it_id;
- }
- }
-}
-
-} // namespace DEG
-
-/* *************************************************** */
-/* Graph Filtering API */
-
-/* Obtain a new graph instance that only contains the subset of desired nodes
- * WARNING: Do NOT pass an already filtered depsgraph through this function again,
- * as we are currently unable to accurately recreate it.
- */
-Depsgraph *DEG_graph_filter(const Depsgraph *graph_src, Main *bmain, DEG_FilterQuery *query)
-{
- const DEG::Depsgraph *deg_graph_src = reinterpret_cast<const DEG::Depsgraph *>(graph_src);
- if (deg_graph_src == NULL) {
- return NULL;
- }
-
- /* Construct a full new depsgraph based on the one we got */
- /* TODO: Improve the builders to not add any ID nodes we don't need later (e.g. ProxyBuilder?) */
- Depsgraph *graph_new = DEG_graph_new(
- deg_graph_src->scene, deg_graph_src->view_layer, deg_graph_src->mode);
- DEG_graph_build_from_view_layer(
- graph_new, bmain, deg_graph_src->scene, deg_graph_src->view_layer);
-
- /* Build a set of all the id's we want to keep */
- GSet *retained_ids = BLI_gset_ptr_new(__func__);
- DEG::RetainedIdUserData retained_id_data = {query, retained_ids};
-
- LISTBASE_FOREACH (DEG_FilterTarget *, target, &query->targets) {
- /* Target Itself */
- BLI_gset_add(retained_ids, (void *)target->id);
-
- /* Target's Ancestors (i.e. things it depends on) */
- DEG_foreach_ancestor_ID(graph_new, target->id, DEG::deg_add_retained_id_cb, &retained_id_data);
- }
-
- /* Remove everything we don't want to keep around anymore */
- DEG::Depsgraph *deg_graph_new = reinterpret_cast<DEG::Depsgraph *>(graph_new);
- if (BLI_gset_len(retained_ids) > 0) {
- DEG::deg_filter_remove_unwanted_ids(deg_graph_new, retained_ids);
- }
- // TODO: query->LOD filters
-
- /* Free temp data */
- BLI_gset_free(retained_ids, NULL);
- retained_ids = NULL;
-
- /* Print Stats */
- // XXX: Hide behind debug flags
- size_t s_outer, s_operations, s_relations;
- size_t s_ids = deg_graph_src->id_nodes.size();
- unsigned int s_idh = BLI_ghash_len(deg_graph_src->id_hash);
-
- size_t n_outer, n_operations, n_relations;
- size_t n_ids = deg_graph_new->id_nodes.size();
- unsigned int n_idh = BLI_ghash_len(deg_graph_new->id_hash);
-
- DEG_stats_simple(graph_src, &s_outer, &s_operations, &s_relations);
- DEG_stats_simple(graph_new, &n_outer, &n_operations, &n_relations);
-
- printf("%s: src = (ID's: %zu (%u), Out: %zu, Op: %zu, Rel: %zu)\n",
- __func__,
- s_ids,
- s_idh,
- s_outer,
- s_operations,
- s_relations);
- printf("%s: new = (ID's: %zu (%u), Out: %zu, Op: %zu, R
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list