diff options
| author | Patrick Mours <pmours@nvidia.com> | 2019-08-21 12:59:57 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-08-26 11:26:53 +0300 |
| commit | 2b999c6a68f85523c46f39bb6a877baba2343d9b (patch) | |
| tree | e76d9728ffdc44f0b38afe1cede2741d5f031ab5 /intern/cycles/kernel/svm/svm_math.h | |
| parent | db257e679a63b1a6a5e361a0b1906e89e8de50cf (diff) | |
Cycles: change svm node decoding for more efficient code generation on GPU
These functions no longer accept NULL. They were renamed for clarity and to
avoid hidden merge issues.
Ref D5363
Diffstat (limited to 'intern/cycles/kernel/svm/svm_math.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_math.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/svm/svm_math.h b/intern/cycles/kernel/svm/svm_math.h index c577a7f13c7..d156dec497c 100644 --- a/intern/cycles/kernel/svm/svm_math.h +++ b/intern/cycles/kernel/svm/svm_math.h @@ -25,7 +25,7 @@ ccl_device void svm_node_math(KernelGlobals *kg, int *offset) { uint a_stack_offset, b_stack_offset; - decode_node_uchar4(inputs_stack_offsets, &a_stack_offset, &b_stack_offset, NULL, NULL); + svm_unpack_node_uchar2(inputs_stack_offsets, &a_stack_offset, &b_stack_offset); float a = stack_load_float(stack, a_stack_offset); float b = stack_load_float(stack, b_stack_offset); @@ -44,9 +44,9 @@ ccl_device void svm_node_vector_math(KernelGlobals *kg, { uint value_stack_offset, vector_stack_offset; uint a_stack_offset, b_stack_offset, scale_stack_offset; - decode_node_uchar4( - inputs_stack_offsets, &a_stack_offset, &b_stack_offset, &scale_stack_offset, NULL); - decode_node_uchar4(outputs_stack_offsets, &value_stack_offset, &vector_stack_offset, NULL, NULL); + svm_unpack_node_uchar3( + inputs_stack_offsets, &a_stack_offset, &b_stack_offset, &scale_stack_offset); + svm_unpack_node_uchar2(outputs_stack_offsets, &value_stack_offset, &vector_stack_offset); float3 a = stack_load_float3(stack, a_stack_offset); float3 b = stack_load_float3(stack, b_stack_offset); |