griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Cleanup, use nested namespace definition

Browse Source
This commit is contained in:
Sergey Sharybin
2022-07-19 11:40:18 +02:00
parent d3c063188e
commit 9b2b61a07b
18 changed files with 36 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/depsgraph/intern/builder/deg_builder.h
View File

@@ -13,8 +13,7 @@ struct Main;
struct Object;
struct bPoseChannel;
namespace blender {
namespace deg {
namespace blender::deg {
struct Depsgraph;
class DepsgraphBuilderCache;
@@ -43,5 +42,4 @@ bool deg_check_id_in_depsgraph(const Depsgraph *graph, ID *id_orig);
bool deg_check_base_in_depsgraph(const Depsgraph *graph, Base *base);
void deg_graph_build_finalize(Main *bmain, Depsgraph *graph);
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/deg_builder_cache.h
View File

@@ -17,8 +17,7 @@ struct ID;
struct PointerRNA;
struct PropertyRNA;
namespace blender {
namespace deg {
namespace blender::deg {
class DepsgraphBuilderCache;
@@ -101,5 +100,4 @@ class DepsgraphBuilderCache {
MEM_CXX_CLASS_ALLOC_FUNCS("DepsgraphBuilderCache");
};
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/deg_builder_cycle.h
View File

@@ -7,13 +7,11 @@
#pragma once
namespace blender {
namespace deg {
namespace blender::deg {
struct Depsgraph;
/* Detect and solve dependency cycles. */
void deg_graph_detect_cycles(Depsgraph *graph);
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/deg_builder_map.h
View File

@@ -11,8 +11,7 @@
struct ID;
namespace blender {
namespace deg {
namespace blender::deg {
class BuilderMap {
public:
@@ -60,5 +59,4 @@ class BuilderMap {
Map<ID *, int> id_tags_;
};
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
View File

@@ -50,8 +50,7 @@ struct bNodeTree;
struct bPoseChannel;
struct bSound;
namespace blender {
namespace deg {
namespace blender::deg {
struct ComponentNode;
struct Depsgraph;
@@ -306,5 +305,4 @@ class DepsgraphNodeBuilder : public DepsgraphBuilder {
BuilderMap built_map_;
};
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
View File

@@ -9,8 +9,7 @@
#include "intern/depsgraph_type.h"
namespace blender {
namespace deg {
namespace blender::deg {
struct RootPChanMap {
/** Debug contents of map. */
@@ -30,5 +29,4 @@ struct RootPChanMap {
Map<StringRefNull, Set<StringRefNull>> map_;
};
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/deg_builder_relations.h
View File

@@ -70,8 +70,7 @@ struct bSound;
struct PropertyRNA;
namespace blender {
namespace deg {
namespace blender::deg {
struct ComponentNode;
struct DepsNodeHandle;
@@ -381,7 +380,6 @@ struct DepsNodeHandle {
const char *default_name;
};
} // namespace deg
} // namespace blender
} // namespace blender::deg
#include "intern/builder/deg_builder_relations_impl.h"

6
source/blender/depsgraph/intern/builder/deg_builder_relations_drivers.h
View File

@@ -15,8 +15,7 @@
struct FCurve;
namespace blender {
namespace deg {
namespace blender::deg {
/* Helper class for determining which relations are needed between driver evaluation nodes. */
class DriverDescriptor {
@@ -59,5 +58,4 @@ class DriverDescriptor {
bool resolve_rna();
};
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
View File

@@ -15,8 +15,7 @@
#include "DNA_object_types.h"
#include "DNA_rigidbody_types.h"
namespace blender {
namespace deg {
namespace blender::deg {
template<typename KeyType>
OperationNode *DepsgraphRelationBuilder::find_operation_node(const KeyType &key)
@@ -209,5 +208,4 @@ bool DepsgraphRelationBuilder::is_same_nodetree_node_dependency(const KeyFrom &k
return true;
}
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/deg_builder_remove_noop.h
View File

@@ -7,13 +7,11 @@
#pragma once
namespace blender {
namespace deg {
namespace blender::deg {
struct Depsgraph;
/* Remove all no-op nodes that have zero outgoing relations. */
void deg_graph_remove_unused_noops(Depsgraph *graph);
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/deg_builder_rna.h
View File

@@ -14,8 +14,7 @@ struct ID;
struct PointerRNA;
struct PropertyRNA;
namespace blender {
namespace deg {
namespace blender::deg {
struct Depsgraph;
struct Node;
@@ -94,5 +93,4 @@ class RNANodeQuery {
bool rna_prop_affects_parameters_node(const PointerRNA *ptr, const PropertyRNA *prop);
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/deg_builder_transitive.h
View File

@@ -7,13 +7,11 @@
#pragma once
namespace blender {
namespace deg {
namespace blender::deg {
struct Depsgraph;
/* Performs a transitive reduction to remove redundant relations. */
void deg_graph_transitive_reduction(Depsgraph *graph);
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/pipeline.h
View File

@@ -16,8 +16,7 @@ struct Main;
struct Scene;
struct ViewLayer;
namespace blender {
namespace deg {
namespace blender::deg {
struct Depsgraph;
class DepsgraphNodeBuilder;
@@ -57,5 +56,4 @@ class AbstractBuilderPipeline {
virtual void build_relations(DepsgraphRelationBuilder &relation_builder) = 0;
};
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/pipeline_all_objects.h
View File

@@ -9,8 +9,7 @@
#include "pipeline_view_layer.h"
namespace blender {
namespace deg {
namespace blender::deg {
/* Builds a dependency graph that contains all objects in the view layer.
* This is contrary to the regular ViewLayerBuilderPipeline, which is limited to visible objects
@@ -24,5 +23,4 @@ class AllObjectsBuilderPipeline : public ViewLayerBuilderPipeline {
virtual unique_ptr<DepsgraphRelationBuilder> construct_relation_builder() override;
};
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/pipeline_compositor.h
View File

@@ -11,8 +11,7 @@
struct bNodeTree;
namespace blender {
namespace deg {
namespace blender::deg {
class CompositorBuilderPipeline : public AbstractBuilderPipeline {
public:
@@ -26,5 +25,4 @@ class CompositorBuilderPipeline : public AbstractBuilderPipeline {
bNodeTree *nodetree_;
};
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/pipeline_from_ids.h
View File

@@ -9,8 +9,7 @@
#include "pipeline.h"
namespace blender {
namespace deg {
namespace blender::deg {
/* Optimized builders for dependency graph built from a given set of IDs.
*
@@ -37,5 +36,4 @@ class FromIDsBuilderPipeline : public AbstractBuilderPipeline {
Span<ID *> ids_;
};
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/pipeline_render.h
View File

@@ -9,8 +9,7 @@
#include "pipeline.h"
namespace blender {
namespace deg {
namespace blender::deg {
class RenderBuilderPipeline : public AbstractBuilderPipeline {
public:
@@ -21,5 +20,4 @@ class RenderBuilderPipeline : public AbstractBuilderPipeline {
virtual void build_relations(DepsgraphRelationBuilder &relation_builder) override;
};
} // namespace deg
} // namespace blender
} // namespace blender::deg

6
source/blender/depsgraph/intern/builder/pipeline_view_layer.h
View File

@@ -9,8 +9,7 @@
#include "pipeline.h"
namespace blender {
namespace deg {
namespace blender::deg {
class ViewLayerBuilderPipeline : public AbstractBuilderPipeline {
public:
@@ -21,5 +20,4 @@ class ViewLayerBuilderPipeline : public AbstractBuilderPipeline {
virtual void build_relations(DepsgraphRelationBuilder &relation_builder) override;
};
} // namespace deg
} // namespace blender
} // namespace blender::deg