From 7b1c5712f888ea37bbccafd9ffd7a3a6a61e665f Mon Sep 17 00:00:00 2001 From: William Leeson Date: Wed, 27 Oct 2021 13:28:13 +0200 Subject: Cycles: Replace saturate with saturatef saturate is depricated in favour of __saturatef this replaces saturate with __saturatef on CUDA by createing a saturatef function which replaces all instances of saturate and are hooked up to the correct function on all platforms. Reviewed By: brecht Differential Revision: https://developer.blender.org/D13010 --- intern/cycles/kernel/svm/bevel.h | 2 +- intern/cycles/kernel/svm/brick.h | 2 +- intern/cycles/kernel/svm/closure.h | 8 ++++---- intern/cycles/kernel/svm/color_util.h | 2 +- intern/cycles/kernel/svm/gradient.h | 2 +- intern/cycles/kernel/svm/hsv.h | 2 +- intern/cycles/kernel/svm/image.h | 6 +++--- intern/cycles/kernel/svm/musgrave.h | 8 ++++---- intern/cycles/kernel/svm/ramp.h | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) (limited to 'intern/cycles/kernel/svm') diff --git a/intern/cycles/kernel/svm/bevel.h b/intern/cycles/kernel/svm/bevel.h index 37c7caf1372..6799489514f 100644 --- a/intern/cycles/kernel/svm/bevel.h +++ b/intern/cycles/kernel/svm/bevel.h @@ -73,7 +73,7 @@ ccl_device_forceinline float svm_bevel_cubic_quintic_root_find(float xi) if (fabsf(f) < tolerance || f_ == 0.0f) break; - x = saturate(x - f / f_); + x = saturatef(x - f / f_); } return x; diff --git a/intern/cycles/kernel/svm/brick.h b/intern/cycles/kernel/svm/brick.h index 3c8729fa027..d8d01766106 100644 --- a/intern/cycles/kernel/svm/brick.h +++ b/intern/cycles/kernel/svm/brick.h @@ -56,7 +56,7 @@ ccl_device_noinline_cpu float2 svm_brick(float3 p, x = (p.x + offset) - brick_width * bricknum; y = p.y - row_height * rownum; - float tint = saturate((brick_noise((rownum << 16) + (bricknum & 0xFFFF)) + bias)); + float tint = saturatef((brick_noise((rownum << 16) + (bricknum & 0xFFFF)) + bias)); float min_dist = min(min(x, y), min(brick_width - x, row_height - y)); float mortar; diff --git a/intern/cycles/kernel/svm/closure.h b/intern/cycles/kernel/svm/closure.h index 1dcfe003f74..71952e9e0f8 100644 --- a/intern/cycles/kernel/svm/closure.h +++ b/intern/cycles/kernel/svm/closure.h @@ -173,9 +173,9 @@ ccl_device_noinline int svm_node_closure_bsdf(KernelGlobals kg, float fresnel = fresnel_dielectric_cos(cosNO, ior); // calculate weights of the diffuse and specular part - float diffuse_weight = (1.0f - saturate(metallic)) * (1.0f - saturate(transmission)); + float diffuse_weight = (1.0f - saturatef(metallic)) * (1.0f - saturatef(transmission)); - float final_transmission = saturate(transmission) * (1.0f - saturate(metallic)); + float final_transmission = saturatef(transmission) * (1.0f - saturatef(metallic)); float specular_weight = (1.0f - final_transmission); // get the base color @@ -746,7 +746,7 @@ ccl_device_noinline int svm_node_closure_bsdf(KernelGlobals kg, if (bsdf) { bsdf->N = N; - bsdf->sigma = saturate(param1); + bsdf->sigma = saturatef(param1); sd->flag |= bsdf_ashikhmin_velvet_setup(bsdf); } break; @@ -1233,7 +1233,7 @@ ccl_device_noinline void svm_node_mix_closure(ccl_private ShaderData *sd, node.y, &weight_offset, &in_weight_offset, &weight1_offset, &weight2_offset); float weight = stack_load_float(stack, weight_offset); - weight = saturate(weight); + weight = saturatef(weight); float in_weight = (stack_valid(in_weight_offset)) ? stack_load_float(stack, in_weight_offset) : 1.0f; diff --git a/intern/cycles/kernel/svm/color_util.h b/intern/cycles/kernel/svm/color_util.h index 82024b61ba4..0c1a510e655 100644 --- a/intern/cycles/kernel/svm/color_util.h +++ b/intern/cycles/kernel/svm/color_util.h @@ -262,7 +262,7 @@ ccl_device float3 svm_mix_clamp(float3 col) ccl_device_noinline_cpu float3 svm_mix(NodeMix type, float fac, float3 c1, float3 c2) { - float t = saturate(fac); + float t = saturatef(fac); switch (type) { case NODE_MIX_BLEND: diff --git a/intern/cycles/kernel/svm/gradient.h b/intern/cycles/kernel/svm/gradient.h index 852196b73dc..42d8dbef792 100644 --- a/intern/cycles/kernel/svm/gradient.h +++ b/intern/cycles/kernel/svm/gradient.h @@ -73,7 +73,7 @@ ccl_device_noinline void svm_node_tex_gradient(ccl_private ShaderData *sd, float3 co = stack_load_float3(stack, co_offset); float f = svm_gradient(co, (NodeGradientType)type); - f = saturate(f); + f = saturatef(f); if (stack_valid(fac_offset)) stack_store_float(stack, fac_offset, f); diff --git a/intern/cycles/kernel/svm/hsv.h b/intern/cycles/kernel/svm/hsv.h index f6881fd4512..fdb266883fa 100644 --- a/intern/cycles/kernel/svm/hsv.h +++ b/intern/cycles/kernel/svm/hsv.h @@ -40,7 +40,7 @@ ccl_device_noinline void svm_node_hsv(KernelGlobals kg, /* Remember: `fmodf` doesn't work for negative numbers here. */ color.x = fmodf(color.x + hue + 0.5f, 1.0f); - color.y = saturate(color.y * sat); + color.y = saturatef(color.y * sat); color.z *= val; color = hsv_to_rgb(color); diff --git a/intern/cycles/kernel/svm/image.h b/intern/cycles/kernel/svm/image.h index 6ddf98a6ef1..2ebd3d4eb87 100644 --- a/intern/cycles/kernel/svm/image.h +++ b/intern/cycles/kernel/svm/image.h @@ -167,17 +167,17 @@ ccl_device_noinline void svm_node_tex_image_box(KernelGlobals kg, /* in case of blending, test for mixes between two textures */ if (N.z < (1.0f - limit) * (N.y + N.x)) { weight.x = N.x / (N.x + N.y); - weight.x = saturate((weight.x - 0.5f * (1.0f - blend)) / blend); + weight.x = saturatef((weight.x - 0.5f * (1.0f - blend)) / blend); weight.y = 1.0f - weight.x; } else if (N.x < (1.0f - limit) * (N.y + N.z)) { weight.y = N.y / (N.y + N.z); - weight.y = saturate((weight.y - 0.5f * (1.0f - blend)) / blend); + weight.y = saturatef((weight.y - 0.5f * (1.0f - blend)) / blend); weight.z = 1.0f - weight.y; } else if (N.y < (1.0f - limit) * (N.x + N.z)) { weight.x = N.x / (N.x + N.z); - weight.x = saturate((weight.x - 0.5f * (1.0f - blend)) / blend); + weight.x = saturatef((weight.x - 0.5f * (1.0f - blend)) / blend); weight.z = 1.0f - weight.x; } else { diff --git a/intern/cycles/kernel/svm/musgrave.h b/intern/cycles/kernel/svm/musgrave.h index 4225c3d2d71..85e32eee638 100644 --- a/intern/cycles/kernel/svm/musgrave.h +++ b/intern/cycles/kernel/svm/musgrave.h @@ -180,7 +180,7 @@ ccl_device_noinline_cpu float noise_musgrave_ridged_multi_fractal_1d( for (int i = 1; i < float_to_int(octaves); i++) { p *= lacunarity; - weight = saturate(signal * gain); + weight = saturatef(signal * gain); signal = offset - fabsf(snoise_1d(p)); signal *= signal; signal *= weight; @@ -351,7 +351,7 @@ ccl_device_noinline_cpu float noise_musgrave_ridged_multi_fractal_2d( for (int i = 1; i < float_to_int(octaves); i++) { p *= lacunarity; - weight = saturate(signal * gain); + weight = saturatef(signal * gain); signal = offset - fabsf(snoise_2d(p)); signal *= signal; signal *= weight; @@ -522,7 +522,7 @@ ccl_device_noinline_cpu float noise_musgrave_ridged_multi_fractal_3d( for (int i = 1; i < float_to_int(octaves); i++) { p *= lacunarity; - weight = saturate(signal * gain); + weight = saturatef(signal * gain); signal = offset - fabsf(snoise_3d(p)); signal *= signal; signal *= weight; @@ -693,7 +693,7 @@ ccl_device_noinline_cpu float noise_musgrave_ridged_multi_fractal_4d( for (int i = 1; i < float_to_int(octaves); i++) { p *= lacunarity; - weight = saturate(signal * gain); + weight = saturatef(signal * gain); signal = offset - fabsf(snoise_4d(p)); signal *= signal; signal *= weight; diff --git a/intern/cycles/kernel/svm/ramp.h b/intern/cycles/kernel/svm/ramp.h index 1dc3383956d..61093e0bd82 100644 --- a/intern/cycles/kernel/svm/ramp.h +++ b/intern/cycles/kernel/svm/ramp.h @@ -44,7 +44,7 @@ ccl_device_inline float float_ramp_lookup( return t0 + dy * f * (table_size - 1); } - f = saturate(f) * (table_size - 1); + f = saturatef(f) * (table_size - 1); /* clamp int as well in case of NaN */ int i = clamp(float_to_int(f), 0, table_size - 1); @@ -76,7 +76,7 @@ ccl_device_inline float4 rgb_ramp_lookup( return t0 + dy * f * (table_size - 1); } - f = saturate(f) * (table_size - 1); + f = saturatef(f) * (table_size - 1); /* clamp int as well in case of NaN */ int i = clamp(float_to_int(f), 0, table_size - 1); -- cgit v1.2.3