diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-08-15 17:17:47 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-08-15 17:28:48 +0300 |
| commit | 33c83a289d269986678caaf7e90ec6d5b729099a (patch) | |
| tree | 2a0cb39c6aa7c331530b49bef8b11ec09d024455 /intern/cycles/kernel/kernel_textures.h | |
| parent | ad4a01ec0fa72ab4626922e9d5d3dda1a46ca01b (diff) | |
Fix Cycles OpenCL textures after recent CUDA fix.
kernel_textures.h is included in device_opencl.cpp, so we can't check
__KERNEL_OPENCL__ there.
Diffstat (limited to 'intern/cycles/kernel/kernel_textures.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index f45da39bad5..8d5bb75a428 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/kernel_textures.h @@ -186,13 +186,11 @@ KERNEL_TEX(uint, texture_uint, __bindless_mapping) #endif /* packed image (opencl) */ -#ifdef __KERNEL_OPENCL__ KERNEL_TEX(uchar4, texture_uchar4, __tex_image_byte4_packed) KERNEL_TEX(float4, texture_float4, __tex_image_float4_packed) KERNEL_TEX(uchar, texture_uchar, __tex_image_byte_packed) KERNEL_TEX(float, texture_float, __tex_image_float_packed) KERNEL_TEX(uint4, texture_uint4, __tex_image_packed_info) -#endif #undef KERNEL_TEX #undef KERNEL_IMAGE_TEX |