Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: change svm node decoding for more efficient code generation on GPU

Browse Source 
These functions no longer accept NULL. They were renamed for clarity and to
avoid hidden merge issues.

Ref D5363
This commit is contained in:
Patrick Mours
2019-08-21 11:59:57 +02:00
committed by Brecht Van Lommel
parent db257e679a
commit 2b999c6a68
28 changed files with 101 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/svm/svm_wave.h
View File

@@ -54,8 +54,8 @@ ccl_device void svm_node_tex_wave(
uint co_offset, scale_offset, detail_offset, dscale_offset, distortion_offset, color_offset,
fac_offset;
decode_node_uchar4(node.y, &type, &color_offset, &fac_offset, &dscale_offset);
decode_node_uchar4(node.z, &co_offset, &scale_offset, &detail_offset, &distortion_offset);
svm_unpack_node_uchar4(node.y, &type, &color_offset, &fac_offset, &dscale_offset);
svm_unpack_node_uchar4(node.z, &co_offset, &scale_offset, &detail_offset, &distortion_offset);
float3 co = stack_load_float3(stack, co_offset);
float scale = stack_load_float_default(stack, scale_offset, node2.x);