Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-12-04 18:17:25 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-12-05 23:21:14 +0300
commited5dbb0a7b2bc7bef3776d31eaf466ec8740560f (patch)
tree37c12781edd198932cdd4e47c950460d9f4271cc /intern/cycles/kernel/svm/svm_ramp.h
parent258564a7b4b26098dc2fabc28aa5a203d2754eff (diff)
Cycles: Implement extrapolation for RGB curves
Previously RGB Curves node will clamp input to 0..1 which is rather useless when one wants to use HDR image textures and do bit of correction on them. Now kernel code supports extrapolation of baked LUT based on first/last two table points and performs linear extrapolation. The only tricky part is to guess the range to bake the LUT for. Currently it's using simple approach -- minmax of the input curves. While this behaves ok for the simple cases it's easy to trick the system up causing incorrect results. Not sure we can solve those issues in a general case and since the new code is giving more expected results it's not that bad actually. In the worst case artist migh always create explicit point to make sure LUT is created for the needed HDR range. Reviewers: brecht, juicyfruit Subscribers: sebastian_k Differential Revision: https://developer.blender.org/D1658
Diffstat (limited to 'intern/cycles/kernel/svm/svm_ramp.h')
-rw-r--r--intern/cycles/kernel/svm/svm_ramp.h49
1 files changed, 38 insertions, 11 deletions
diff --git a/intern/cycles/kernel/svm/svm_ramp.h b/intern/cycles/kernel/svm/svm_ramp.h
index 062ab013b1f..48d969947f5 100644
--- a/intern/cycles/kernel/svm/svm_ramp.h
+++ b/intern/cycles/kernel/svm/svm_ramp.h
@@ -19,8 +19,27 @@
CCL_NAMESPACE_BEGIN
-ccl_device float4 rgb_ramp_lookup(KernelGlobals *kg, int offset, float f, bool interpolate)
+ccl_device float4 rgb_ramp_lookup(KernelGlobals *kg,
+ int offset,
+ float f,
+ bool interpolate,
+ bool extrapolate)
{
+ if((f < 0.0f || f > 1.0f) && extrapolate) {
+ float4 t0, dy;
+ if(f < 0.0f) {
+ t0 = fetch_node_float(kg, offset);
+ dy = t0 - fetch_node_float(kg, offset + 1);
+ f = -f;
+ }
+ else {
+ t0 = fetch_node_float(kg, offset + RAMP_TABLE_SIZE - 1);
+ dy = t0 - fetch_node_float(kg, offset + RAMP_TABLE_SIZE - 2);
+ f = f - 1.0f;
+ }
+ return t0 + dy * f * (RAMP_TABLE_SIZE-1);
+ }
+
f = saturate(f)*(RAMP_TABLE_SIZE-1);
/* clamp int as well in case of NaN */
@@ -43,7 +62,7 @@ ccl_device void svm_node_rgb_ramp(KernelGlobals *kg, ShaderData *sd, float *stac
decode_node_uchar4(node.y, &fac_offset, &color_offset, &alpha_offset, NULL);
float fac = stack_load_float(stack, fac_offset);
- float4 color = rgb_ramp_lookup(kg, *offset, fac, interpolate);
+ float4 color = rgb_ramp_lookup(kg, *offset, fac, interpolate, false);
if(stack_valid(color_offset))
stack_store_float3(stack, color_offset, float4_to_float3(color));
@@ -55,16 +74,24 @@ ccl_device void svm_node_rgb_ramp(KernelGlobals *kg, ShaderData *sd, float *stac
ccl_device void svm_node_rgb_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;
+ uint fac_offset, color_offset, out_offset;
+ decode_node_uchar4(node.y,
+ &fac_offset,
+ &color_offset,
+ &out_offset,
+ NULL);
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, true).x;
- float g = rgb_ramp_lookup(kg, *offset, color.y, true).y;
- float b = rgb_ramp_lookup(kg, *offset, color.z, true).z;
+ const float min_x = __int_as_float(node.z),
+ max_x = __int_as_float(node.w);
+ const float range_x = max_x - min_x;
+ color = (color - make_float3(min_x, min_x, min_x)) / range_x;
+
+ float r = rgb_ramp_lookup(kg, *offset, color.x, true, true).x;
+ float g = rgb_ramp_lookup(kg, *offset, color.y, true, true).y;
+ float b = rgb_ramp_lookup(kg, *offset, color.z, true, true).z;
color = (1.0f - fac)*color + fac*make_float3(r, g, b);
stack_store_float3(stack, out_offset, color);
@@ -81,9 +108,9 @@ ccl_device void svm_node_vector_curves(KernelGlobals *kg, ShaderData *sd, float
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, true).x;
- float g = rgb_ramp_lookup(kg, *offset, (color.y + 1.0f)*0.5f, true).y;
- float b = rgb_ramp_lookup(kg, *offset, (color.z + 1.0f)*0.5f, true).z;
+ float r = rgb_ramp_lookup(kg, *offset, (color.x + 1.0f)*0.5f, true, false).x;
+ float g = rgb_ramp_lookup(kg, *offset, (color.y + 1.0f)*0.5f, true, false).y;
+ float b = rgb_ramp_lookup(kg, *offset, (color.z + 1.0f)*0.5f, true, false).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);