diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-23 21:39:41 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-23 21:39:41 +0400 |
| commit | 2a9b5e8f816c5c72280aa66c82c3d94b666149c0 (patch) | |
| tree | ee418dc9969bef7527e81f6f164fce97f0c117e8 /intern/cycles/kernel/svm/svm_math.h | |
| parent | bb7fdc7935b8e909dfa10ec1dde654c6ce2f18a1 (diff) | |
Fix #33267: cycles math node power gave different results for CPU and GPU. The
GPU variants do not support pow(-1, 2), it doesn't check for even exponents, do
manually now.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_math.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_math.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_math.h b/intern/cycles/kernel/svm/svm_math.h index e39c7a4ba6c..db3b8d3f763 100644 --- a/intern/cycles/kernel/svm/svm_math.h +++ b/intern/cycles/kernel/svm/svm_math.h @@ -38,6 +38,21 @@ __device float safe_acosf(float a) return acosf(a); } +__device float compatible_powf(float x, float y) +{ + /* GPU pow doesn't accept negative x, do manual checks here */ + if(x < 0.0f) { + if(fmod(-y, 2.0f) == 0.0f) + return powf(-x, y); + else + return -powf(-x, y); + } + else if(x == 0.0f) + return 0.0f; + + return powf(x, y); +} + __device float safe_powf(float a, float b) { if(b == 0.0f) @@ -47,7 +62,7 @@ __device float safe_powf(float a, float b) if(a < 0.0f && b != (int)b) return 0.0f; - return powf(a, b); + return compatible_powf(a, b); } __device float safe_logf(float a, float b) |