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_musgrave.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_musgrave.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_musgrave.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/svm/svm_musgrave.h b/intern/cycles/kernel/svm/svm_musgrave.h index 67fb5ca6241..298155b795f 100644 --- a/intern/cycles/kernel/svm/svm_musgrave.h +++ b/intern/cycles/kernel/svm/svm_musgrave.h @@ -222,10 +222,10 @@ ccl_device void svm_node_tex_musgrave( uint dimension_offset, lacunarity_offset, detail_offset, offset_offset; uint gain_offset, scale_offset; - decode_node_uchar4(node.y, &type, &co_offset, &color_offset, &fac_offset); - decode_node_uchar4( + svm_unpack_node_uchar4(node.y, &type, &co_offset, &color_offset, &fac_offset); + svm_unpack_node_uchar4( node.z, &dimension_offset, &lacunarity_offset, &detail_offset, &offset_offset); - decode_node_uchar4(node.w, &gain_offset, &scale_offset, NULL, NULL); + svm_unpack_node_uchar2(node.w, &gain_offset, &scale_offset); float3 co = stack_load_float3(stack, co_offset); float dimension = stack_load_float_default(stack, dimension_offset, node2.x); |