diff options
Diffstat (limited to 'intern/cycles/kernel/svm/svm_ramp.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_ramp.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/intern/cycles/kernel/svm/svm_ramp.h b/intern/cycles/kernel/svm/svm_ramp.h index c64413cbe84..054137fe7a3 100644 --- a/intern/cycles/kernel/svm/svm_ramp.h +++ b/intern/cycles/kernel/svm/svm_ramp.h @@ -63,9 +63,9 @@ __device void svm_node_rgb_curves(KernelGlobals *kg, ShaderData *sd, float *stac float fac = stack_load_float(stack, fac_offset); float3 color = stack_load_float3(stack, color_offset); - float r = rgb_ramp_lookup(kg, *offset, rgb_ramp_lookup(kg, *offset, color.x).w).x; - float g = rgb_ramp_lookup(kg, *offset, rgb_ramp_lookup(kg, *offset, color.y).w).y; - float b = rgb_ramp_lookup(kg, *offset, rgb_ramp_lookup(kg, *offset, color.z).w).z; + float r = rgb_ramp_lookup(kg, *offset, color.x).x; + float g = rgb_ramp_lookup(kg, *offset, color.y).y; + float b = rgb_ramp_lookup(kg, *offset, color.z).z; color = (1.0f - fac)*color + fac*make_float3(r, g, b); stack_store_float3(stack, out_offset, color); @@ -73,6 +73,25 @@ __device void svm_node_rgb_curves(KernelGlobals *kg, ShaderData *sd, float *stac *offset += RAMP_TABLE_SIZE; } +__device void svm_node_vector_curves(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset) +{ + uint fac_offset = node.y; + uint color_offset = node.z; + uint out_offset = node.w; + + float fac = stack_load_float(stack, fac_offset); + float3 color = stack_load_float3(stack, color_offset); + + float r = rgb_ramp_lookup(kg, *offset, (color.x + 1.0f)*0.5f).x; + float g = rgb_ramp_lookup(kg, *offset, (color.y + 1.0f)*0.5f).y; + float b = rgb_ramp_lookup(kg, *offset, (color.z + 1.0f)*0.5f).z; + + color = (1.0f - fac)*color + fac*make_float3(r*2.0f - 1.0f, g*2.0f - 1.0f, b*2.0f - 1.0f); + stack_store_float3(stack, out_offset, color); + + *offset += RAMP_TABLE_SIZE; +} + CCL_NAMESPACE_END #endif /* __SVM_RAMP_H__ */ |