[Bf-blender-cvs] [9043020] depsgraph_cleanup: Depsgraph: Move transitive reduction and cycles solver to builder folder

[Sergey Sharybin]

Commit: 904302046b0237dd0931bbee2b5083e6ed11f30a
Author: Sergey Sharybin
Date:   Thu May 26 11:58:04 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rB904302046b0237dd0931bbee2b5083e6ed11f30a

Depsgraph: Move transitive reduction and cycles solver to builder folder

This algorithms are only used for graph building and having them in util
was causing some bad level includes from util/ to intern/.

===================================================================

M	source/blender/depsgraph/CMakeLists.txt
A	source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
A	source/blender/depsgraph/intern/builder/deg_builder_cycle.h
A	source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
A	source/blender/depsgraph/intern/builder/deg_builder_transitive.h
M	source/blender/depsgraph/intern/depsgraph_build.cc
D	source/blender/depsgraph/util/depsgraph_util_cycle.cc
D	source/blender/depsgraph/util/depsgraph_util_cycle.h
D	source/blender/depsgraph/util/depsgraph_util_transitive.cc
D	source/blender/depsgraph/util/depsgraph_util_transitive.h

===================================================================

diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index 31e5612..5844a48 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -43,8 +43,10 @@ set(INC_SYS
 
 set(SRC
 	intern/builder/deg_builder.cc
+	intern/builder/deg_builder_cycle.cc
 	intern/builder/deg_builder_nodes.cc
 	intern/builder/deg_builder_relations.cc
+	intern/builder/deg_builder_transitive.cc
 	intern/debug/deg_debug_graphviz.cc
 	intern/eval/deg_eval.cc
 	intern/eval/deg_eval_debug.cc
@@ -59,9 +61,7 @@ set(SRC
 	intern/depsgraph_query.cc
 	intern/depsgraph_tag.cc
 	intern/depsgraph_type_defines.cc
-	util/depsgraph_util_cycle.cc
 	util/depsgraph_util_pchanmap.cc
-	util/depsgraph_util_transitive.cc
 
 	DEG_depsgraph.h
 	DEG_depsgraph_build.h
@@ -69,8 +69,10 @@ set(SRC
 	DEG_depsgraph_query.h
 
 	intern/builder/deg_builder.h
+	intern/builder/deg_builder_cycle.h
 	intern/builder/deg_builder_nodes.h
 	intern/builder/deg_builder_relations.h
+	intern/builder/deg_builder_transitive.h
 	intern/eval/deg_eval.h
 	intern/eval/deg_eval_debug.h
 	intern/eval/deg_eval_flush.h
@@ -81,13 +83,11 @@ set(SRC
 	intern/depsgraph_intern.h
 	intern/depsgraph_types.h
 
-	util/depsgraph_util_cycle.h
 	util/depsgraph_util_function.h
 	util/depsgraph_util_hash.h
 	util/depsgraph_util_map.h
 	util/depsgraph_util_pchanmap.h
 	util/depsgraph_util_set.h
-	util/depsgraph_util_transitive.h
 )
 
 if(WITH_CXX11)
diff --git a/source/blender/depsgraph/util/depsgraph_util_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
similarity index 97%
rename from source/blender/depsgraph/util/depsgraph_util_cycle.cc
rename to source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
index ff30f5f..00d64f7 100644
--- a/source/blender/depsgraph/util/depsgraph_util_cycle.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
@@ -23,11 +23,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/util/depsgraph_util_cycle.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_cycle.cc
  *  \ingroup depsgraph
  */
 
-#include "depsgraph_util_cycle.h"
+#include "intern/builder/deg_builder_cycle.h"
 
 // TOO(sergey): Use some wrappers over those?
 #include <cstdio>
diff --git a/source/blender/depsgraph/util/depsgraph_util_cycle.h b/source/blender/depsgraph/intern/builder/deg_builder_cycle.h
similarity index 91%
rename from source/blender/depsgraph/util/depsgraph_util_cycle.h
rename to source/blender/depsgraph/intern/builder/deg_builder_cycle.h
index 4549cf5..386fbd8 100644
--- a/source/blender/depsgraph/util/depsgraph_util_cycle.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.h
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/util/depsgraph_util_cycle.h
+/** \file blender/depsgraph/intern/builder/deg_builder_cycle.h
  *  \ingroup depsgraph
  */
 
@@ -34,6 +34,7 @@ namespace DEG {
 
 struct Depsgraph;
 
+/* Detect and solve dependency cycles. */
 void deg_graph_detect_cycles(Depsgraph *graph);
 
 }  // namespace DEG
diff --git a/source/blender/depsgraph/util/depsgraph_util_transitive.cc b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
similarity index 96%
rename from source/blender/depsgraph/util/depsgraph_util_transitive.cc
rename to source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
index d580c63..a87a999 100644
--- a/source/blender/depsgraph/util/depsgraph_util_transitive.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
@@ -24,11 +24,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/util/depsgraph_util_transitive.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_transitive.cc
  *  \ingroup depsgraph
  */
 
-#include "depsgraph_util_transitive.h"
+#include "intern/builder/deg_builder_transitive.h"
 
 extern "C" {
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/depsgraph/util/depsgraph_util_transitive.h b/source/blender/depsgraph/intern/builder/deg_builder_transitive.h
similarity index 89%
rename from source/blender/depsgraph/util/depsgraph_util_transitive.h
rename to source/blender/depsgraph/intern/builder/deg_builder_transitive.h
index 43ee086..be9d7c3 100644
--- a/source/blender/depsgraph/util/depsgraph_util_transitive.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_transitive.h
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/util/depsgraph_util_transitive.h
+/** \file blender/depsgraph/intern/builder/deg_builder_transitive.h
  *  \ingroup depsgraph
  */
 
@@ -34,6 +34,7 @@ namespace DEG {
 
 struct Depsgraph;
 
+/* Performs a transitive reduction to remove redundant relations. */
 void deg_graph_transitive_reduction(Depsgraph *graph);
 
 }  // namespace DEG
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index c1ab627..939829f 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -45,8 +45,10 @@ extern "C" {
 } /* extern "C" */
 
 #include "builder/deg_builder.h"
+#include "builder/deg_builder_cycle.h"
 #include "builder/deg_builder_nodes.h"
 #include "builder/deg_builder_relations.h"
+#include "builder/deg_builder_transitive.h"
 
 #include "intern/nodes/deg_node.h"
 #include "intern/nodes/deg_node_component.h"
@@ -55,9 +57,7 @@ extern "C" {
 #include "depsgraph_types.h"
 #include "depsgraph_intern.h"
 
-#include "depsgraph_util_cycle.h"
 #include "depsgraph_util_foreach.h"
-#include "depsgraph_util_transitive.h"
 
 /* ****************** */
 /* External Build API */