diff options
| author | Sv. Lockal <lockalsash@gmail.com> | 2015-05-05 09:11:54 +0300 |
|---|---|---|
| committer | Sv. Lockal <lockalsash@gmail.com> | 2015-05-05 09:11:54 +0300 |
| commit | 7201f6d14c0161ad9a0d4143d1c5caf872e0d93e (patch) | |
| tree | cf3d0b69ed4a1ad54a42c4c9322df396ab3e2a0e /intern/cycles/kernel/svm/svm.h | |
| parent | 22bbd1c51219aafb40adb3e9a206f660a621fd70 (diff) | |
Cycles: Use curve approximation for blackbody instead of lookup table
Now we calculate color in range 800..12000 using an approximation a/x+bx+c for R and G and ((at + b)t + c)t + d) for B.
Max absolute error for RGB for non-lut function is less than 0.0001, which is enough to get the same 8 bit/channel color as for OSL with a noticeable performance difference.
However there is a slight visible difference between previous non-OSL implementation because of lookup table interpolation and offset-by-one mistake.
The previous implementation gave black color outside of soft range (t > 12000), now it gives the same color as for 12000.
Also blackbody node without input connected is being converted to value input at shader compile time.
Reviewers: dingto, sergey
Reviewed By: dingto
Subscribers: nutel, brecht, juicyfruit
Differential Revision: https://developer.blender.org/D1280
Diffstat (limited to 'intern/cycles/kernel/svm/svm.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index dd9173d92b3..1598019856a 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -142,6 +142,8 @@ CCL_NAMESPACE_END #include "svm_noise.h" #include "svm_texture.h" +#include "svm_math_util.h" + #include "svm_attribute.h" #include "svm_gradient.h" #include "svm_blackbody.h" @@ -164,7 +166,6 @@ CCL_NAMESPACE_END #include "svm_mapping.h" #include "svm_normal.h" #include "svm_wave.h" -#include "svm_math_util.h" #include "svm_math.h" #include "svm_mix.h" #include "svm_ramp.h" |