diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/nodes/intern/node_exec.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/nodes/intern/node_exec.h')
-rw-r--r-- | source/blender/nodes/intern/node_exec.h | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/source/blender/nodes/intern/node_exec.h b/source/blender/nodes/intern/node_exec.h index 145bee149d1..336a8f26ec3 100644 --- a/source/blender/nodes/intern/node_exec.h +++ b/source/blender/nodes/intern/node_exec.h @@ -21,7 +21,6 @@ * \ingroup nodes */ - #ifndef __NODE_EXEC_H__ #define __NODE_EXEC_H__ @@ -41,48 +40,61 @@ struct bNodeTree; /* Node execution data */ typedef struct bNodeExec { - struct bNode *node; /* backpointer to node */ - bNodeExecData data; + struct bNode *node; /* backpointer to node */ + bNodeExecData data; - NodeFreeExecFunction freeexecfunc; /* free function, stored in exec itself to avoid dangling node pointer access */ + NodeFreeExecFunction + freeexecfunc; /* free function, stored in exec itself to avoid dangling node pointer access */ } bNodeExec; /* Execution Data for each instance of node tree execution */ typedef struct bNodeTreeExec { - struct bNodeTree *nodetree; /* backpointer to node tree */ + struct bNodeTree *nodetree; /* backpointer to node tree */ - int totnodes; /* total node count */ - struct bNodeExec *nodeexec; /* per-node execution data */ + int totnodes; /* total node count */ + struct bNodeExec *nodeexec; /* per-node execution data */ - int stacksize; - struct bNodeStack *stack; /* socket data stack */ - /* only used by material and texture trees to keep one stack for each thread */ - ListBase *threadstack; /* one instance of the stack for each thread */ + int stacksize; + struct bNodeStack *stack; /* socket data stack */ + /* only used by material and texture trees to keep one stack for each thread */ + ListBase *threadstack; /* one instance of the stack for each thread */ } bNodeTreeExec; /* stores one stack copy for each thread (material and texture trees) */ typedef struct bNodeThreadStack { - struct bNodeThreadStack *next, *prev; - struct bNodeStack *stack; - bool used; + struct bNodeThreadStack *next, *prev; + struct bNodeStack *stack; + bool used; } bNodeThreadStack; int node_exec_socket_use_stack(struct bNodeSocket *sock); struct bNodeStack *node_get_socket_stack(struct bNodeStack *stack, struct bNodeSocket *sock); -void node_get_stack(struct bNode *node, struct bNodeStack *stack, struct bNodeStack **in, struct bNodeStack **out); - -struct bNodeTreeExec *ntree_exec_begin(struct bNodeExecContext *context, struct bNodeTree *ntree, bNodeInstanceKey parent_key); +void node_get_stack(struct bNode *node, + struct bNodeStack *stack, + struct bNodeStack **in, + struct bNodeStack **out); + +struct bNodeTreeExec *ntree_exec_begin(struct bNodeExecContext *context, + struct bNodeTree *ntree, + bNodeInstanceKey parent_key); void ntree_exec_end(struct bNodeTreeExec *exec); struct bNodeThreadStack *ntreeGetThreadStack(struct bNodeTreeExec *exec, int thread); void ntreeReleaseThreadStack(struct bNodeThreadStack *nts); -bool ntreeExecThreadNodes(struct bNodeTreeExec *exec, struct bNodeThreadStack *nts, void *callerdata, int thread); - -struct bNodeTreeExec *ntreeShaderBeginExecTree_internal(struct bNodeExecContext *context, struct bNodeTree *ntree, bNodeInstanceKey parent_key); +bool ntreeExecThreadNodes(struct bNodeTreeExec *exec, + struct bNodeThreadStack *nts, + void *callerdata, + int thread); + +struct bNodeTreeExec *ntreeShaderBeginExecTree_internal(struct bNodeExecContext *context, + struct bNodeTree *ntree, + bNodeInstanceKey parent_key); void ntreeShaderEndExecTree_internal(struct bNodeTreeExec *exec); -struct bNodeTreeExec *ntreeTexBeginExecTree_internal(struct bNodeExecContext *context, struct bNodeTree *ntree, bNodeInstanceKey parent_key); +struct bNodeTreeExec *ntreeTexBeginExecTree_internal(struct bNodeExecContext *context, + struct bNodeTree *ntree, + bNodeInstanceKey parent_key); void ntreeTexEndExecTree_internal(struct bNodeTreeExec *exec); #endif |