Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/kernel/svm/svm_voronoi.h')
-rw-r--r--intern/cycles/kernel/svm/svm_voronoi.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/intern/cycles/kernel/svm/svm_voronoi.h b/intern/cycles/kernel/svm/svm_voronoi.h
index 062a8bde415..b8067520770 100644
--- a/intern/cycles/kernel/svm/svm_voronoi.h
+++ b/intern/cycles/kernel/svm/svm_voronoi.h
@@ -917,7 +917,7 @@ ccl_device void voronoi_n_sphere_radius_4d(float4 coord,
}
template<uint node_feature_mask>
-ccl_device_noinline int svm_node_tex_voronoi(ccl_global const KernelGlobals *kg,
+ccl_device_noinline int svm_node_tex_voronoi(KernelGlobals kg,
ccl_private ShaderData *sd,
ccl_private float *stack,
uint dimensions,
@@ -1013,7 +1013,8 @@ ccl_device_noinline int svm_node_tex_voronoi(ccl_global const KernelGlobals *kg,
&position_out_2d);
break;
case NODE_VORONOI_SMOOTH_F1:
- if (KERNEL_NODES_FEATURE(VORONOI_EXTRA)) {
+ IF_KERNEL_NODES_FEATURE(VORONOI_EXTRA)
+ {
voronoi_smooth_f1_2d(coord_2d,
smoothness,
exponent,
@@ -1058,7 +1059,8 @@ ccl_device_noinline int svm_node_tex_voronoi(ccl_global const KernelGlobals *kg,
&position_out);
break;
case NODE_VORONOI_SMOOTH_F1:
- if (KERNEL_NODES_FEATURE(VORONOI_EXTRA)) {
+ IF_KERNEL_NODES_FEATURE(VORONOI_EXTRA)
+ {
voronoi_smooth_f1_3d(coord,
smoothness,
exponent,
@@ -1092,7 +1094,8 @@ ccl_device_noinline int svm_node_tex_voronoi(ccl_global const KernelGlobals *kg,
}
case 4: {
- if (KERNEL_NODES_FEATURE(VORONOI_EXTRA)) {
+ IF_KERNEL_NODES_FEATURE(VORONOI_EXTRA)
+ {
float4 coord_4d = make_float4(coord.x, coord.y, coord.z, w);
float4 position_out_4d;
switch (voronoi_feature) {