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/shader/node_shader_util.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/shader/node_shader_util.h')
-rw-r--r-- | source/blender/nodes/shader/node_shader_util.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index e457f2f8b56..916cb81953e 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -21,7 +21,6 @@ * \ingroup nodes */ - #ifndef __NODE_SHADER_UTIL_H__ #define __NODE_SHADER_UTIL_H__ @@ -70,24 +69,28 @@ #include "GPU_material.h" #include "GPU_uniformbuffer.h" - bool sh_node_poll_default(struct bNodeType *ntype, struct bNodeTree *ntree); -void sh_node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass, short flag); - +void sh_node_type_base( + struct bNodeType *ntype, int type, const char *name, short nclass, short flag); /* ********* exec data struct, remains internal *********** */ typedef struct ShaderCallData { - /* Empty for now, may be reused if we convert shader to texture nodes. */ - int dummy; + /* Empty for now, may be reused if we convert shader to texture nodes. */ + int dummy; } ShaderCallData; void nodestack_get_vec(float *in, short type_in, bNodeStack *ns); void node_gpu_stack_from_data(struct GPUNodeStack *gs, int type, struct bNodeStack *ns); void node_data_from_gpu_stack(struct bNodeStack *ns, struct GPUNodeStack *gs); -void node_shader_gpu_tex_mapping(struct GPUMaterial *mat, struct bNode *node, struct GPUNodeStack *in, struct GPUNodeStack *out); - -void ntreeExecGPUNodes(struct bNodeTreeExec *exec, struct GPUMaterial *mat, struct bNode *output_node); +void node_shader_gpu_tex_mapping(struct GPUMaterial *mat, + struct bNode *node, + struct GPUNodeStack *in, + struct GPUNodeStack *out); + +void ntreeExecGPUNodes(struct bNodeTreeExec *exec, + struct GPUMaterial *mat, + struct bNode *output_node); #endif |