diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-26 16:45:14 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-26 16:45:14 +0400 |
| commit | bbc3d820f44ca62810c1800cf7caa3905b6116a6 (patch) | |
| tree | 3cb45928cc5e8e758b3cabd18ebe79a763f162d5 /intern/cycles/kernel/svm/svm.h | |
| parent | 56baed13da0e3cf1206afd17f65bba00ec4a287c (diff) | |
Cycles: add ColorRamp node.
Diffstat (limited to 'intern/cycles/kernel/svm/svm.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index f1bae9c8d9f..50181c0cf2c 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -104,6 +104,12 @@ __device_inline float4 read_node_float(KernelGlobals *kg, int *offset) return f; } +__device_inline float4 fetch_node_float(KernelGlobals *kg, int offset) +{ + uint4 node = kernel_tex_fetch(__svm_nodes, offset); + return make_float4(__int_as_float(node.x), __int_as_float(node.y), __int_as_float(node.z), __int_as_float(node.w)); +} + __device_inline void decode_node_uchar4(uint i, uint *x, uint *y, uint *z, uint *w) { if(x) *x = (i & 0xFF); @@ -140,6 +146,7 @@ CCL_NAMESPACE_END #include "svm_wave.h" #include "svm_math.h" #include "svm_mix.h" +#include "svm_ramp.h" #include "svm_sepcomb_rgb.h" #include "svm_musgrave.h" #include "svm_sky.h" @@ -331,6 +338,12 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_EMISSION_SET_WEIGHT_TOTAL: svm_node_emission_set_weight_total(kg, sd, node.y, node.z, node.w); break; + case NODE_RGB_RAMP: + svm_node_rgb_ramp(kg, sd, stack, node, &offset); + break; + case NODE_RGB_CURVES: + svm_node_rgb_curves(kg, sd, stack, node, &offset); + break; case NODE_END: default: #ifndef __MULTI_CLOSURE__ |