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_compat_opencl.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_compat_opencl.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_opencl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h index 287bf320881..5515966807b 100644 --- a/intern/cycles/kernel/kernel_compat_opencl.h +++ b/intern/cycles/kernel/kernel_compat_opencl.h @@ -100,7 +100,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) kernel_tex_interp_(kg->t, kg->t##_width, x) +#define kernel_tex_interp(t, x, size) kernel_tex_interp_(kg->t, size, x) #define kernel_tex_fetch(t, index) kg->t[index] /* define NULL */ |