diff options
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_cuda.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_cuda.h | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/intern/cycles/kernel/kernel_compat_cuda.h b/intern/cycles/kernel/kernel_compat_cuda.h index d10d3255e1b..42314756f02 100644 --- a/intern/cycles/kernel/kernel_compat_cuda.h +++ b/intern/cycles/kernel/kernel_compat_cuda.h @@ -67,20 +67,29 @@ typedef texture<uchar4, 2, cudaReadModeNormalizedFloat> texture_image_uchar4; /* Macros to handle different memory storage on different devices */ -/* In order to use full 6GB of memory on Titan cards, use arrays instead - * of textures. On earlier cards this seems slower, but on Titan it is - * actually slightly faster in tests. */ +/* On Fermi cards (4xx and 5xx), we use regular textures for both data and images. + * On Kepler (6xx) and above, we use Bindless Textures for images and arrays for data. + * + * Arrays are necessary in order to use the full VRAM on newer cards, and it's slightly faster. + * Using Arrays on Fermi turned out to be slower.*/ + +/* Fermi */ #if __CUDA_ARCH__ < 300 # define __KERNEL_CUDA_TEX_STORAGE__ -#endif - -#ifdef __KERNEL_CUDA_TEX_STORAGE__ # define kernel_tex_fetch(t, index) tex1Dfetch(t, index) + +# define kernel_tex_image_interp(t, x, y) tex2D(t, x, y) +# define kernel_tex_image_interp_3d(t, x, y, z) tex3D(t, x, y, z) + +/* Kepler */ #else # define kernel_tex_fetch(t, index) t[(index)] + +# define kernel_tex_image_interp_float4(t, x, y) tex2D<float4>(t, x, y) +# define kernel_tex_image_interp_float(t, x, y) tex2D<float>(t, x, y) +# define kernel_tex_image_interp_3d_float4(t, x, y, z) tex3D<float4>(t, x, y, z) +# define kernel_tex_image_interp_3d_float(t, x, y, z) tex3D<float>(t, x, y, z) #endif -#define kernel_tex_image_interp(t, x, y) tex2D(t, x, y) -#define kernel_tex_image_interp_3d(t, x, y, z) tex3D(t, x, y, z) #define kernel_data __data |