diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-22 17:15:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-22 17:15:19 +0400 |
| commit | 47853bf6f6fa7ab4dc523fe255a8253b7ae9f914 (patch) | |
| tree | 8c968c8577dc88681b121501f87851d9eca35dab /intern/cycles/kernel/kernel_camera.h | |
| parent | c71e31eb4f814c1ef561ac5467af3c16efa02a0d (diff) | |
Cycles: OpenCL tweaks
* Reduce kernel arguments size, helps compile for apple nvidia.
* Fix use of unitialized variable in displace kernel.
* Use build flags in opencl kernel md5 hash.
* Reorganize code for kernel feature #defines a bit.
Diffstat (limited to 'intern/cycles/kernel/kernel_camera.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_camera.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h index c2828c20eee..9cdc2f1f865 100644 --- a/intern/cycles/kernel/kernel_camera.h +++ b/intern/cycles/kernel/kernel_camera.h @@ -127,8 +127,8 @@ __device void camera_sample_orthographic(KernelGlobals *kg, float raster_x, floa __device void camera_sample(KernelGlobals *kg, int x, int y, float filter_u, float filter_v, float lens_u, float lens_v, Ray *ray) { /* pixel filter */ - float raster_x = x + kernel_tex_interp(__filter_table, filter_u); - float raster_y = y + kernel_tex_interp(__filter_table, filter_v); + 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); /* motion blur */ //ray->time = lerp(time_t, kernel_data.cam.shutter_open, kernel_data.cam.shutter_close); |