Fix T96132: Cycles RGB/Vector/Float Curve shaders ignore extrapolation setting

Differential Revision: https://developer.blender.org/D14393

4 files changed, 19 insertions, 15 deletions

diff --git a/intern/cycles/kernel/osl/shaders/node_float_curve.osl b/intern/cycles/kernel/osl/shaders/node_float_curve.osl
index 265a21bd4aa..70de1217877 100644
--- a/intern/cycles/kernel/osl/shaders/node_float_curve.osl
+++ b/intern/cycles/kernel/osl/shaders/node_float_curve.osl
@@ -7,13 +7,15 @@
 shader node_float_curve(float ramp[] = {0.0},
                         float min_x = 0.0,
                         float max_x = 1.0,
+                        int extrapolate = 1,
+
                         float ValueIn = 0.0,
                         float Factor = 0.0,
                         output float ValueOut = 0.0)
 {
   float c = (ValueIn - min_x) / (max_x - min_x);
 
-  ValueOut = rgb_ramp_lookup(ramp, c, 1, 1);
+  ValueOut = rgb_ramp_lookup(ramp, c, 1, extrapolate);
 
   ValueOut = mix(ValueIn, ValueOut, Factor);
 }
diff --git a/intern/cycles/kernel/osl/shaders/node_rgb_curves.osl b/intern/cycles/kernel/osl/shaders/node_rgb_curves.osl
index b73c74801ee..388fdd05b70 100644
--- a/intern/cycles/kernel/osl/shaders/node_rgb_curves.osl
+++ b/intern/cycles/kernel/osl/shaders/node_rgb_curves.osl
@@ -7,6 +7,7 @@
 shader node_rgb_curves(color ramp[] = {0.0},
                        float min_x = 0.0,
                        float max_x = 1.0,
+                       int extrapolate = 1,
 
                        color ColorIn = 0.0,
                        float Fac = 0.0,
@@ -14,9 +15,9 @@ shader node_rgb_curves(color ramp[] = {0.0},
 {
   color c = (ColorIn - color(min_x, min_x, min_x)) / (max_x - min_x);
 
-  color r = rgb_ramp_lookup(ramp, c[0], 1, 1);
-  color g = rgb_ramp_lookup(ramp, c[1], 1, 1);
-  color b = rgb_ramp_lookup(ramp, c[2], 1, 1);
+  color r = rgb_ramp_lookup(ramp, c[0], 1, extrapolate);
+  color g = rgb_ramp_lookup(ramp, c[1], 1, extrapolate);
+  color b = rgb_ramp_lookup(ramp, c[2], 1, extrapolate);
 
   ColorOut[0] = r[0];
   ColorOut[1] = g[1];
diff --git a/intern/cycles/kernel/osl/shaders/node_vector_curves.osl b/intern/cycles/kernel/osl/shaders/node_vector_curves.osl
index a3bf1209e6e..3ef720ad6d6 100644
--- a/intern/cycles/kernel/osl/shaders/node_vector_curves.osl
+++ b/intern/cycles/kernel/osl/shaders/node_vector_curves.osl
@@ -7,6 +7,7 @@
 shader node_vector_curves(color ramp[] = {0.0},
                           float min_x = 0.0,
                           float max_x = 1.0,
+                          int extrapolate = 1,
 
                           vector VectorIn = vector(0.0, 0.0, 0.0),
                           float Fac = 0.0,
@@ -14,9 +15,9 @@ shader node_vector_curves(color ramp[] = {0.0},
 {
   vector c = (VectorIn - vector(min_x, min_x, min_x)) / (max_x - min_x);
 
-  color r = rgb_ramp_lookup(ramp, c[0], 1, 1);
-  color g = rgb_ramp_lookup(ramp, c[0], 1, 1);
-  color b = rgb_ramp_lookup(ramp, c[0], 1, 1);
+  color r = rgb_ramp_lookup(ramp, c[0], 1, extrapolate);
+  color g = rgb_ramp_lookup(ramp, c[0], 1, extrapolate);
+  color b = rgb_ramp_lookup(ramp, c[0], 1, extrapolate);
 
   VectorOut[0] = r[0];
   VectorOut[1] = g[1];
diff --git a/intern/cycles/kernel/svm/ramp.h b/intern/cycles/kernel/svm/ramp.h
index aba90284a2e..342b15da9ed 100644
--- a/intern/cycles/kernel/svm/ramp.h
+++ b/intern/cycles/kernel/svm/ramp.h
@@ -102,8 +102,8 @@ ccl_device_noinline int svm_node_rgb_ramp(
 ccl_device_noinline int svm_node_curves(
     KernelGlobals kg, ccl_private ShaderData *sd, ccl_private float *stack, uint4 node, int offset)
 {
-  uint fac_offset, color_offset, out_offset;
-  svm_unpack_node_uchar3(node.y, &fac_offset, &color_offset, &out_offset);
+  uint fac_offset, color_offset, out_offset, extrapolate;
+  svm_unpack_node_uchar4(node.y, &fac_offset, &color_offset, &out_offset, &extrapolate);
 
   uint table_size = read_node(kg, &offset).x;
 
@@ -114,9 +114,9 @@ ccl_device_noinline int svm_node_curves(
   const float range_x = max_x - min_x;
   const float3 relpos = (color - make_float3(min_x, min_x, min_x)) / range_x;
 
-  float r = rgb_ramp_lookup(kg, offset, relpos.x, true, true, table_size).x;
-  float g = rgb_ramp_lookup(kg, offset, relpos.y, true, true, table_size).y;
-  float b = rgb_ramp_lookup(kg, offset, relpos.z, true, true, table_size).z;
+  float r = rgb_ramp_lookup(kg, offset, relpos.x, true, extrapolate, table_size).x;
+  float g = rgb_ramp_lookup(kg, offset, relpos.y, true, extrapolate, table_size).y;
+  float b = rgb_ramp_lookup(kg, offset, relpos.z, true, extrapolate, table_size).z;
 
   color = (1.0f - fac) * color + fac * make_float3(r, g, b);
   stack_store_float3(stack, out_offset, color);
@@ -128,8 +128,8 @@ ccl_device_noinline int svm_node_curves(
 ccl_device_noinline int svm_node_curve(
     KernelGlobals kg, ccl_private ShaderData *sd, ccl_private float *stack, uint4 node, int offset)
 {
-  uint fac_offset, value_in_offset, out_offset;
-  svm_unpack_node_uchar3(node.y, &fac_offset, &value_in_offset, &out_offset);
+  uint fac_offset, value_in_offset, out_offset, extrapolate;
+  svm_unpack_node_uchar4(node.y, &fac_offset, &value_in_offset, &out_offset, &extrapolate);
 
   uint table_size = read_node(kg, &offset).x;
 
@@ -140,7 +140,7 @@ ccl_device_noinline int svm_node_curve(
   const float range = max - min;
   const float relpos = (in - min) / range;
 
-  float v = float_ramp_lookup(kg, offset, relpos, true, true, table_size);
+  float v = float_ramp_lookup(kg, offset, relpos, true, extrapolate, table_size);
 
   in = (1.0f - fac) * in + fac * v;
   stack_store_float(stack, out_offset, in);