diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/kernel_compat_cuda.h | 1 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_compat_cuda.h b/intern/cycles/kernel/kernel_compat_cuda.h index d656fac81e6..9a96cb9f438 100644 --- a/intern/cycles/kernel/kernel_compat_cuda.h +++ b/intern/cycles/kernel/kernel_compat_cuda.h @@ -67,6 +67,7 @@ typedef texture<float, 1> texture_float; typedef texture<uint, 1> texture_uint; typedef texture<int, 1> texture_int; typedef texture<uint4, 1> texture_uint4; +typedef texture<uchar, 1> texture_uchar; typedef texture<uchar4, 1> texture_uchar4; typedef texture<float4, 2> texture_image_float4; typedef texture<float4, 3> texture_image3d_float4; 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 |