diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 17:41:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:18:11 +0300 |
| commit | d140e70c496122915eb5c05aba83153e2e0d7998 (patch) | |
| tree | 1e589247d69da64aa7b0e7802319237ec050b5d6 /intern/cycles/util/util_math_fast.h | |
| parent | 147bd16ed1bb3415b30408b0eab110d0854eadd2 (diff) | |
| parent | 295d0c52a26730edc6d4ed1276e4051cce006be5 (diff) | |
Merge branch 'master' into temp-ghash-experimentstemp-ghash-experiments
Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.
Conflicts:
source/blender/blenlib/BLI_ghash.h
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/hash_mm2a.c
source/blender/bmesh/tools/bmesh_region_match.c
tests/gtests/blenlib/BLI_ghash_performance_test.cc
tests/gtests/blenlib/BLI_ghash_test.cc
tests/gtests/blenlib/CMakeLists.txt
Diffstat (limited to 'intern/cycles/util/util_math_fast.h')
| -rw-r--r-- | intern/cycles/util/util_math_fast.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/util/util_math_fast.h b/intern/cycles/util/util_math_fast.h index 4ad81e9c015..c1a1be603f4 100644 --- a/intern/cycles/util/util_math_fast.h +++ b/intern/cycles/util/util_math_fast.h @@ -360,7 +360,7 @@ ccl_device float fast_log2f(float x) { /* NOTE: clamp to avoid special cases and make result "safe" from large * negative values/nans. */ - clamp(x, FLT_MIN, FLT_MAX); + x = clamp(x, FLT_MIN, FLT_MAX); unsigned bits = __float_as_uint(x); int exponent = (int)(bits >> 23) - 127; float f = __uint_as_float((bits & 0x007FFFFF) | 0x3f800000) - 1.0f; @@ -402,7 +402,7 @@ ccl_device float fast_logb(float x) { /* Don't bother with denormals. */ x = fabsf(x); - clamp(x, FLT_MIN, FLT_MAX); + x = clamp(x, FLT_MIN, FLT_MAX); unsigned bits = __float_as_uint(x); return (int)(bits >> 23) - 127; } @@ -410,7 +410,7 @@ ccl_device float fast_logb(float x) ccl_device float fast_exp2f(float x) { /* Clamp to safe range for final addition. */ - clamp(x, -126.0f, 126.0f); + x = clamp(x, -126.0f, 126.0f); /* Range reduction. */ int m = (int)x; x -= m; x = 1.0f - (1.0f - x); /* Crush denormals (does not affect max ulps!). */ @@ -539,7 +539,7 @@ ccl_device float fast_safe_powf(float x, float y) * bsdf_microfaset.h. */ -ccl_device float fast_erff(float x) +ccl_device_inline float fast_erff(float x) { /* Examined 1082130433 values of erff on [0,4]: 1.93715e-06 max error. */ /* Abramowitz and Stegun, 7.1.28. */ @@ -570,7 +570,7 @@ ccl_device_inline float fast_erfcf(float x) return 1.0f - fast_erff(x); } -ccl_device float fast_ierff(float x) +ccl_device_inline float fast_ierff(float x) { /* From: Approximating the erfinv function by Mike Giles. */ /* To avoid trouble at the limit, clamp input to 1-eps. */ |