diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-07-02 02:58:06 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-07-02 02:58:06 +0400 |
| commit | 6ac06523955ef765d82cb094b890dc7e78ab6d14 (patch) | |
| tree | 62002d8cd520dfa2f66a0f2901fe03c584d561f4 /intern | |
| parent | 978dba4616852e0b94374f2ae56934049d9b3669 (diff) | |
Cleanup: Update list and remove ifdef here.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index 55960701318..f60ed8ccd07 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/kernel_textures.h @@ -173,10 +173,9 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_095) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_096) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_097) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_098) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_099) /* Kepler and above */ -#if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300) +KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_099) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_100) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_101) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_102) @@ -228,7 +227,6 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_147) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_148) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_149) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_150) -#endif /* packed image (opencl) */ KERNEL_TEX(uchar4, texture_uchar4, __tex_image_packed) |