blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Nodes: Remove unnecessary RNA pointer creation 

`rna_NodeSocket_refine` and `rna_Node_refine` take significant time
when building the `NodeTreeRef` acceleration data structure, but they
aren't used at all. This commit removes their eager calculation and
instead creates them on-demand in the `rna()` functions. They also
aren't inlined to avoid including `RNA_prototypes.h` in the header.

Differential Revision: https://developer.blender.org/D14674
This commit is contained in:
Hans Goudey 2022-04-18 10:12:17 -05:00
parent 933fed2a17
commit ef2b8c1c3a
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/nodes/NOD_node_tree_ref.hh
View File

@ -65,7 +65,6 @@ class SocketRef : NonCopyable, NonMovable {
bool is_input_;
int id_;
int index_;
PointerRNA rna_;
Vector<LinkRef *> directly_linked_links_;
/* These sockets are linked directly, i.e. with a single link in between. */
@ -101,7 +100,7 @@ class SocketRef : NonCopyable, NonMovable {
const InputSocketRef &as_input() const;
const OutputSocketRef &as_output() const;
PointerRNA *rna() const;
PointerRNA rna() const;
StringRefNull idname() const;
StringRefNull name() const;
@ -152,7 +151,6 @@ class NodeRef : NonCopyable, NonMovable {
private:
NodeTreeRef *tree_;
bNode *bnode_;
PointerRNA rna_;
int id_;
Vector<InputSocketRef *> inputs_;
Vector<OutputSocketRef *> outputs_;
@ -183,7 +181,7 @@ class NodeRef : NonCopyable, NonMovable {
bNode *bnode() const;
bNodeTree *btree() const;
PointerRNA *rna() const;
PointerRNA rna() const;
StringRefNull idname() const;
StringRefNull name() const;
StringRefNull label() const;
@ -410,11 +408,6 @@ inline const OutputSocketRef &SocketRef::as_output() const
return static_cast<const OutputSocketRef &>(*this);
}
inline PointerRNA *SocketRef::rna() const
{
return const_cast<PointerRNA *>(&rna_);
}
inline StringRefNull SocketRef::idname() const
{
return bsocket_->idname;
@ -571,11 +564,6 @@ inline bNodeTree *NodeRef::btree() const
return tree_->btree();
}
inline PointerRNA *NodeRef::rna() const
{
return const_cast<PointerRNA *>(&rna_);
}
inline StringRefNull NodeRef::idname() const
{
return bnode_->idname;

17
source/blender/nodes/intern/node_tree_ref.cc
View File

@ -21,7 +21,6 @@ NodeTreeRef::NodeTreeRef(bNodeTree *btree) : btree_(btree)
node.tree_ = this;
node.bnode_ = bnode;
node.id_ = nodes_by_id_.append_and_get_index(&node);
RNA_pointer_create(&btree->id, &RNA_Node, bnode, &node.rna_);
LISTBASE_FOREACH (bNodeSocket *, bsocket, &bnode->inputs) {
InputSocketRef &socket = *allocator_.construct<InputSocketRef>().release();
@ -30,7 +29,6 @@ NodeTreeRef::NodeTreeRef(bNodeTree *btree) : btree_(btree)
socket.is_input_ = true;
socket.bsocket_ = bsocket;
socket.id_ = sockets_by_id_.append_and_get_index(&socket);
RNA_pointer_create(&btree->id, &RNA_NodeSocket, bsocket, &socket.rna_);
}
LISTBASE_FOREACH (bNodeSocket *, bsocket, &bnode->outputs) {
@ -40,7 +38,6 @@ NodeTreeRef::NodeTreeRef(bNodeTree *btree) : btree_(btree)
socket.is_input_ = false;
socket.bsocket_ = bsocket;
socket.id_ = sockets_by_id_.append_and_get_index(&socket);
RNA_pointer_create(&btree->id, &RNA_NodeSocket, bsocket, &socket.rna_);
}
LISTBASE_FOREACH (bNodeLink *, blink, &bnode->internal_links) {
@ -664,4 +661,18 @@ const NodeTreeRef &get_tree_ref_from_map(NodeTreeRefMap &node_tree_refs, bNodeTr
[&]() { return std::make_unique<NodeTreeRef>(&btree); });
}
PointerRNA NodeRef::rna() const
{
PointerRNA rna;
RNA_pointer_create(&tree_->btree()->id, &RNA_Node, bnode_, &rna);
return rna;
}
PointerRNA SocketRef::rna() const
{
PointerRNA rna;
RNA_pointer_create(&this->tree().btree()->id, &RNA_NodeSocket, bsocket_, &rna);
return rna;
}
} // namespace blender::nodes