Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2016-08-15 01:04:19 +0300
committerThomas Dinges <blender@dingto.org>2016-08-15 01:04:19 +0300
commit4d41d8be790ecee0d91ac7b08b3611ec4d14096a (patch)
tree3a9d96f6076f793d52e9d47f6a0d756b7dca1c80
parenta18b2ba64366bd1a4c9a729aaafce68ab1fee5a7 (diff)
Fix CUDA compilation after OpenCL changes.
-rw-r--r--intern/cycles/kernel/kernel_textures.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h
index 8d5bb75a428..f45da39bad5 100644
--- a/intern/cycles/kernel/kernel_textures.h
+++ b/intern/cycles/kernel/kernel_textures.h
@@ -186,11 +186,13 @@ 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