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:
authorWilliam Leeson <leesonw>2021-10-27 14:28:13 +0300
committerWilliam Leeson <william@blender.org>2021-10-27 15:05:46 +0300
commit7b1c5712f888ea37bbccafd9ffd7a3a6a61e665f (patch)
tree659551f820d8b70fe1c37ac6a8711fcd73cd7434 /intern/cycles/kernel/svm/musgrave.h
parent18b6f0d0f18732a071b75ad56a2475c383d19111 (diff)
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
Diffstat (limited to 'intern/cycles/kernel/svm/musgrave.h')
-rw-r--r--intern/cycles/kernel/svm/musgrave.h8
1 files changed, 4 insertions, 4 deletions
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;