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 /intern/cycles/kernel/svm/svm_math.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 'intern/cycles/kernel/svm/svm_math.h')
-rw-r--r-- | intern/cycles/kernel/svm/svm_math.h | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/intern/cycles/kernel/svm/svm_math.h b/intern/cycles/kernel/svm/svm_math.h index c9a838361cd..5920913825b 100644 --- a/intern/cycles/kernel/svm/svm_math.h +++ b/intern/cycles/kernel/svm/svm_math.h @@ -18,32 +18,46 @@ CCL_NAMESPACE_BEGIN /* Nodes */ -ccl_device void svm_node_math(KernelGlobals *kg, ShaderData *sd, float *stack, uint itype, uint f1_offset, uint f2_offset, int *offset) +ccl_device void svm_node_math(KernelGlobals *kg, + ShaderData *sd, + float *stack, + uint itype, + uint f1_offset, + uint f2_offset, + int *offset) { - NodeMath type = (NodeMath)itype; - float f1 = stack_load_float(stack, f1_offset); - float f2 = stack_load_float(stack, f2_offset); - float f = svm_math(type, f1, f2); + NodeMath type = (NodeMath)itype; + float f1 = stack_load_float(stack, f1_offset); + float f2 = stack_load_float(stack, f2_offset); + float f = svm_math(type, f1, f2); - uint4 node1 = read_node(kg, offset); + uint4 node1 = read_node(kg, offset); - stack_store_float(stack, node1.y, f); + stack_store_float(stack, node1.y, f); } -ccl_device void svm_node_vector_math(KernelGlobals *kg, ShaderData *sd, float *stack, uint itype, uint v1_offset, uint v2_offset, int *offset) +ccl_device void svm_node_vector_math(KernelGlobals *kg, + ShaderData *sd, + float *stack, + uint itype, + uint v1_offset, + uint v2_offset, + int *offset) { - NodeVectorMath type = (NodeVectorMath)itype; - float3 v1 = stack_load_float3(stack, v1_offset); - float3 v2 = stack_load_float3(stack, v2_offset); - float f; - float3 v; + NodeVectorMath type = (NodeVectorMath)itype; + float3 v1 = stack_load_float3(stack, v1_offset); + float3 v2 = stack_load_float3(stack, v2_offset); + float f; + float3 v; - svm_vector_math(&f, &v, type, v1, v2); + svm_vector_math(&f, &v, type, v1, v2); - uint4 node1 = read_node(kg, offset); + uint4 node1 = read_node(kg, offset); - if(stack_valid(node1.y)) stack_store_float(stack, node1.y, f); - if(stack_valid(node1.z)) stack_store_float3(stack, node1.z, v); + if (stack_valid(node1.y)) + stack_store_float(stack, node1.y, f); + if (stack_valid(node1.z)) + stack_store_float3(stack, node1.z, v); } CCL_NAMESPACE_END |