diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-08 02:54:35 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-17 22:39:16 +0300 |
| commit | 08670d3b8117cda608c178688f261e1204794a0d (patch) | |
| tree | 4a82f0e7d2212bfc956619880d6b7cc168a2e7df /intern/cycles/kernel/shaders/node_rgb_curves.osl | |
| parent | 93e4ae84ad31dc6a56fd249592b24007ea286ddc (diff) | |
Code refactor: use dynamic shader node array lengths now that OSL supports them.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_rgb_curves.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_rgb_curves.osl | 16 |
1 files changed, 9 insertions, 7 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, |