Code refactor: use dynamic shader node array lengths now that OSL supports them.

5 files changed, 46 insertions, 37 deletions

diff --git a/intern/cycles/kernel/shaders/node_rgb_curves.osl b/intern/cycles/kernel/shaders/node_rgb_curves.osl
index fc93dbd044b..8e208e8a8f7 100644
--- a/intern/cycles/kernel/shaders/node_rgb_curves.osl
+++ b/intern/cycles/kernel/shaders/node_rgb_curves.osl
@@ -17,8 +17,10 @@
 #include "stdosl.h"
 #include "oslutil.h"
 
-float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
+float ramp_lookup(color ramp[], float at, int component)
 {
+	int table_size = arraylength(ramp);
+
 	if (at < 0.0 || at > 1.0) {
 		float t0, dy;
 		if (at < 0.0) {
@@ -27,19 +29,19 @@ float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
 			at = -at;
 		}
 		else {
-			t0 = ramp[RAMP_TABLE_SIZE - 1][component];
-			dy = t0 - ramp[RAMP_TABLE_SIZE - 2][component];
+			t0 = ramp[table_size - 1][component];
+			dy = t0 - ramp[table_size - 2][component];
 			at = at - 1.0;
 		}
-		return t0 + dy * at * (RAMP_TABLE_SIZE - 1);
+		return t0 + dy * at * (table_size - 1);
 	}
 
-	float f = clamp(at, 0.0, 1.0) * (RAMP_TABLE_SIZE - 1);
+	float f = clamp(at, 0.0, 1.0) * (table_size - 1);
 
 	/* clamp int as well in case of NaN */
 	int i = (int)f;
 	if (i < 0) i = 0;
-	if (i >= RAMP_TABLE_SIZE) i = RAMP_TABLE_SIZE - 1;
+	if (i >= table_size) i = table_size - 1;
 	float t = f - (float)i;
 
 	float result = ramp[i][component];
@@ -51,7 +53,7 @@ float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
 }
 
 shader node_rgb_curves(
-	color ramp[RAMP_TABLE_SIZE] = {0.0},
+	color ramp[] = {0.0},
 	float min_x = 0.0,
 	float max_x = 1.0,
 
diff --git a/intern/cycles/kernel/shaders/node_rgb_ramp.osl b/intern/cycles/kernel/shaders/node_rgb_ramp.osl
index 0202ba0bf79..2ab6b6778b7 100644
--- a/intern/cycles/kernel/shaders/node_rgb_ramp.osl
+++ b/intern/cycles/kernel/shaders/node_rgb_ramp.osl
@@ -18,20 +18,21 @@
 #include "oslutil.h"
 
 shader node_rgb_ramp(
-	color ramp_color[RAMP_TABLE_SIZE] = {0.0},
-	float ramp_alpha[RAMP_TABLE_SIZE] = {0.0},
+	color ramp_color[] = {0.0},
+	float ramp_alpha[] = {0.0},
 	int ramp_interpolate = 1,
 
 	float Fac = 0.0,
 	output color Color = 0.0,
 	output float Alpha = 1.0)
 {
-	float f = clamp(Fac, 0.0, 1.0) * (RAMP_TABLE_SIZE - 1);
+	int table_size = arraylength(ramp_color);
+	float f = clamp(Fac, 0.0, 1.0) * (table_size - 1);
 
 	/* clamp int as well in case of NaN */
 	int i = (int)f;
 	if (i < 0) i = 0;
-	if (i >= RAMP_TABLE_SIZE) i = RAMP_TABLE_SIZE - 1;
+	if (i >= table_size) i = table_size - 1;
 	float t = f - (float)i;
 
 	Color = ramp_color[i];
diff --git a/intern/cycles/kernel/shaders/node_vector_curves.osl b/intern/cycles/kernel/shaders/node_vector_curves.osl
index 4d4c28b57a2..cff4efe1d98 100644
--- a/intern/cycles/kernel/shaders/node_vector_curves.osl
+++ b/intern/cycles/kernel/shaders/node_vector_curves.osl
@@ -17,8 +17,10 @@
 #include "stdosl.h"
 #include "oslutil.h"
 
-float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
+float ramp_lookup(color ramp[], float at, int component)
 {
+	int table_size = arraylength(ramp);
+
 	if (at < 0.0 || at > 1.0) {
 		float t0, dy;
 		if (at < 0.0) {
@@ -27,19 +29,19 @@ float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
 			at = -at;
 		}
 		else {
-			t0 = ramp[RAMP_TABLE_SIZE - 1][component];
-			dy = t0 - ramp[RAMP_TABLE_SIZE - 2][component];
+			t0 = ramp[table_size - 1][component];
+			dy = t0 - ramp[table_size - 2][component];
 			at = at - 1.0;
 		}
-		return t0 + dy * at * (RAMP_TABLE_SIZE - 1);
+		return t0 + dy * at * (table_size - 1);
 	}
 
-	float f = clamp(at, 0.0, 1.0) * (RAMP_TABLE_SIZE - 1);
+	float f = clamp(at, 0.0, 1.0) * (table_size - 1);
 
 	/* clamp int as well in case of NaN */
 	int i = (int)f;
 	if (i < 0) i = 0;
-	if (i >= RAMP_TABLE_SIZE) i = RAMP_TABLE_SIZE - 1;
+	if (i >= table_size) i = table_size - 1;
 	float t = f - (float)i;
 
 	float result = ramp[i][component];
@@ -51,7 +53,7 @@ float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
 }
 
 shader node_vector_curves(
-	color ramp[RAMP_TABLE_SIZE] = {0.0},
+	color ramp[] = {0.0},
 	float min_x = 0.0,
 	float max_x = 1.0,
 
diff --git a/intern/cycles/kernel/shaders/oslutil.h b/intern/cycles/kernel/shaders/oslutil.h
index d90900bc474..141e5d27e3a 100644
--- a/intern/cycles/kernel/shaders/oslutil.h
+++ b/intern/cycles/kernel/shaders/oslutil.h
@@ -33,9 +33,6 @@
 #ifndef CCL_OSLUTIL_H
 #define CCL_OSLUTIL_H
 
-/* NB: must match the value in kernel_types.h */
-#define RAMP_TABLE_SIZE 256
-
 // Return wireframe opacity factor [0, 1] given a geometry type in
 // ("triangles", "polygons" or "patches"), and a line_width in raster
 // or world space depending on the last (raster) boolean argument.
diff --git a/intern/cycles/kernel/svm/svm_ramp.h b/intern/cycles/kernel/svm/svm_ramp.h
index 7e4106e212e..59dec409a70 100644
--- a/intern/cycles/kernel/svm/svm_ramp.h
+++ b/intern/cycles/kernel/svm/svm_ramp.h
@@ -23,7 +23,8 @@ ccl_device float4 rgb_ramp_lookup(KernelGlobals *kg,
                                   int offset,
                                   float f,
                                   bool interpolate,
-                                  bool extrapolate)
+                                  bool extrapolate,
+                                  int table_size)
 {
 	if((f < 0.0f || f > 1.0f) && extrapolate) {
 		float4 t0, dy;
@@ -33,17 +34,17 @@ ccl_device float4 rgb_ramp_lookup(KernelGlobals *kg,
 			f = -f;
 		}
 		else {
-			t0 = fetch_node_float(kg, offset + RAMP_TABLE_SIZE - 1);
-			dy = t0 - fetch_node_float(kg, offset + RAMP_TABLE_SIZE - 2);
+			t0 = fetch_node_float(kg, offset + table_size - 1);
+			dy = t0 - fetch_node_float(kg, offset + table_size - 2);
 			f = f - 1.0f;
 		}
-		return t0 + dy * f * (RAMP_TABLE_SIZE-1);
+		return t0 + dy * f * (table_size-1);
 	}
 
-	f = saturate(f)*(RAMP_TABLE_SIZE-1);
+	f = saturate(f)*(table_size-1);
 
 	/* clamp int as well in case of NaN */
-	int i = clamp(float_to_int(f), 0, RAMP_TABLE_SIZE-1);
+	int i = clamp(float_to_int(f), 0, table_size-1);
 	float t = f - (float)i;
 
 	float4 a = fetch_node_float(kg, offset+i);
@@ -61,15 +62,17 @@ 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);
 
+	uint table_size = read_node(kg, offset).x;
+
 	float fac = stack_load_float(stack, fac_offset);
-	float4 color = rgb_ramp_lookup(kg, *offset, fac, interpolate, false);
+	float4 color = rgb_ramp_lookup(kg, *offset, fac, interpolate, false, table_size);
 
 	if(stack_valid(color_offset))
 		stack_store_float3(stack, color_offset, float4_to_float3(color));
 	if(stack_valid(alpha_offset))
 		stack_store_float(stack, alpha_offset, color.w);
 
-	*offset += RAMP_TABLE_SIZE;
+	*offset += table_size;
 }
 
 ccl_device void svm_node_rgb_curves(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
@@ -81,6 +84,8 @@ ccl_device void svm_node_rgb_curves(KernelGlobals *kg, ShaderData *sd, float *st
 	                   &out_offset,
 	                   NULL);
 
+	uint table_size = read_node(kg, offset).x;
+
 	float fac = stack_load_float(stack, fac_offset);
 	float3 color = stack_load_float3(stack, color_offset);
 
@@ -89,14 +94,14 @@ ccl_device void svm_node_rgb_curves(KernelGlobals *kg, ShaderData *sd, float *st
 	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;
+	float r = rgb_ramp_lookup(kg, *offset, color.x, true, true, table_size).x;
+	float g = rgb_ramp_lookup(kg, *offset, color.y, true, true, table_size).y;
+	float b = rgb_ramp_lookup(kg, *offset, color.z, true, true, table_size).z;
 
 	color = (1.0f - fac)*color + fac*make_float3(r, g, b);
 	stack_store_float3(stack, out_offset, color);
 
-	*offset += RAMP_TABLE_SIZE;
+	*offset += table_size;
 }
 
 ccl_device void svm_node_vector_curves(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
@@ -108,6 +113,8 @@ ccl_device void svm_node_vector_curves(KernelGlobals *kg, ShaderData *sd, float
 	                   &out_offset,
 	                   NULL);
 
+	uint table_size = read_node(kg, offset).x;
+
 	float fac = stack_load_float(stack, fac_offset);
 	float3 color = stack_load_float3(stack, color_offset);
 
@@ -116,14 +123,14 @@ ccl_device void svm_node_vector_curves(KernelGlobals *kg, ShaderData *sd, float
 	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;
+	float r = rgb_ramp_lookup(kg, *offset, color.x, true, true, table_size).x;
+	float g = rgb_ramp_lookup(kg, *offset, color.y, true, true, table_size).y;
+	float b = rgb_ramp_lookup(kg, *offset, color.z, true, true, table_size).z;
 
 	color = (1.0f - fac)*color + fac*make_float3(r, g, b);
 	stack_store_float3(stack, out_offset, color);
 
-	*offset += RAMP_TABLE_SIZE;
+	*offset += table_size;
 }
 
 CCL_NAMESPACE_END