diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-02 00:26:43 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-02 00:26:43 +0400 |
commit | 40b05d364e988bca01dd338026dc24765f56187a (patch) | |
tree | 83e4d808d93cf9c78c128738044106b127fa6dff /intern/cycles/kernel | |
parent | 8588fec935c47529d9c1816f19e94ff0d20ed1a9 (diff) |
Cycles: code refactoring to add generic lookup table memory.
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/kernel_camera.h | 5 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_compat_cpu.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_compat_cuda.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_compat_opencl.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 5 |
6 files changed, 15 insertions, 13 deletions
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h index 02f64cd649a..1d081b54681 100644 --- a/intern/cycles/kernel/kernel_camera.h +++ b/intern/cycles/kernel/kernel_camera.h @@ -224,8 +224,9 @@ __device void camera_sample(KernelGlobals *kg, int x, int y, float filter_u, flo float lens_u, float lens_v, float time, Ray *ray) { /* pixel filter */ - float raster_x = x + kernel_tex_interp(__filter_table, filter_u, FILTER_TABLE_SIZE); - float raster_y = y + kernel_tex_interp(__filter_table, filter_v, FILTER_TABLE_SIZE); + int filter_table_offset = kernel_data.film.filter_table_offset; + float raster_x = x + kernel_tex_lookup(__lookup_table, filter_u, filter_table_offset, FILTER_TABLE_SIZE); + float raster_y = y + kernel_tex_lookup(__lookup_table, filter_v, filter_table_offset, FILTER_TABLE_SIZE); #ifdef __CAMERA_MOTION__ /* motion blur */ diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h index 01bb78e8e1c..b7df7f86bf6 100644 --- a/intern/cycles/kernel/kernel_compat_cpu.h +++ b/intern/cycles/kernel/kernel_compat_cpu.h @@ -57,7 +57,7 @@ template<typename T> struct texture { } #endif - float interp(float x, int size) + float lookup(float x, int offset, int size) { kernel_assert(size == width); @@ -67,7 +67,7 @@ template<typename T> struct texture { 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]; } T *data; @@ -157,7 +157,7 @@ typedef texture_image<uchar4> texture_image_uchar4; #define kernel_tex_fetch(tex, index) (kg->tex.fetch(index)) #define kernel_tex_fetch_m128(tex, index) (kg->tex.fetch_m128(index)) #define kernel_tex_fetch_m128i(tex, index) (kg->tex.fetch_m128i(index)) -#define kernel_tex_interp(tex, t, size) (kg->tex.interp(t, size)) +#define kernel_tex_lookup(tex, t, offset, size) (kg->tex.lookup(t, offset, size)) #define kernel_tex_image_interp(tex, x, y) ((tex < MAX_FLOAT_IMAGES) ? kg->texture_float_images[tex].interp(x, y) : kg->texture_byte_images[tex - MAX_FLOAT_IMAGES].interp(x, y)) #define kernel_data (kg->__data) diff --git a/intern/cycles/kernel/kernel_compat_cuda.h b/intern/cycles/kernel/kernel_compat_cuda.h index 9fd065c3cda..fdee59e225e 100644 --- a/intern/cycles/kernel/kernel_compat_cuda.h +++ b/intern/cycles/kernel/kernel_compat_cuda.h @@ -58,7 +58,7 @@ typedef texture<uchar4, 2, cudaReadModeNormalizedFloat> texture_image_uchar4; /* Macros to handle different memory storage on different devices */ #define kernel_tex_fetch(t, index) tex1Dfetch(t, index) -#define kernel_tex_interp(t, x, size) tex1D(t, x) +#define kernel_tex_lookup(t, x, offset, size) tex1D(t, x) // XXX broken! #define kernel_tex_image_interp(t, x, y) tex2D(t, x, y) #define kernel_data __data 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 */ diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index e27de95e7ab..55c6e15ad04 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/kernel_textures.h @@ -66,8 +66,8 @@ KERNEL_TEX(uint4, texture_uint4, __svm_nodes) KERNEL_TEX(uint, texture_uint, __shader_flag) KERNEL_TEX(uint, texture_uint, __object_flag) -/* camera/film */ -KERNEL_TEX(float, texture_float, __filter_table) +/* lookup tables */ +KERNEL_TEX(float, texture_float, __lookup_table) /* sobol */ KERNEL_TEX(uint, texture_uint, __sobol_directions) diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index ddbda9240fb..f6b8a1b8b82 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -611,8 +611,9 @@ typedef struct KernelFilm { int pass_shadow; float pass_shadow_scale; - int pass_pad1; - int pass_pad2; + + int filter_table_offset; + int filter_pad; } KernelFilm; typedef struct KernelBackground { |