Cycles: code refactoring to add generic lookup table memory.

1 files changed, 3 insertions, 3 deletions

diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h
index abb2f094f5c..dcbaf8fdbd2 100644
--- a/intern/cycles/kernel/kernel_compat_opencl.h
+++ b/intern/cycles/kernel/kernel_compat_opencl.h
@@ -46,7 +46,7 @@
 #define kernel_assert(cond)
 
 /* manual implementation of interpolated 1D lookup */
-__device float kernel_tex_interp_(__global float *data, int width, float x)
+__device float kernel_tex_lookup_(__global float *data, int offset, int width, float x)
 {
 	x = clamp(x, 0.0f, 1.0f)*width;
 
@@ -54,7 +54,7 @@ __device float kernel_tex_interp_(__global float *data, int width, float x)
 	int nindex = min(index+1, width-1);
 	float t = x - index;
 
-	return (1.0f - t)*data[index] + t*data[nindex];
+	return (1.0f - t)*data[index + offset] + t*data[nindex + offset];
 }
 
 /* make_type definitions with opencl style element initializers */
@@ -114,7 +114,7 @@ __device float kernel_tex_interp_(__global float *data, int width, float x)
 
 /* data lookup defines */
 #define kernel_data (*kg->data)
-#define kernel_tex_interp(t, x, size) kernel_tex_interp_(kg->t, size, x)
+#define kernel_tex_lookup(t, x, offset, size) kernel_tex_lookup_(kg->t, offset, size, x)
 #define kernel_tex_fetch(t, index) kg->t[index]
 
 /* define NULL */