[Bf-blender-cvs] [4d41d8b] master: Fix CUDA compilation after OpenCL changes.

[Thomas Dinges]

Commit: 4d41d8be790ecee0d91ac7b08b3611ec4d14096a
Author: Thomas Dinges
Date:   Mon Aug 15 00:04:19 2016 +0200
Branches: master
https://developer.blender.org/rB4d41d8be790ecee0d91ac7b08b3611ec4d14096a

Fix CUDA compilation after OpenCL changes.

===================================================================

M	intern/cycles/kernel/kernel_textures.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h
index 8d5bb75..f45da39 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