[Bf-blender-cvs] [33c83a2] master: Fix Cycles OpenCL textures after recent CUDA fix.

[Brecht Van Lommel]

Commit: 33c83a289d269986678caaf7e90ec6d5b729099a
Author: Brecht Van Lommel
Date:   Mon Aug 15 16:17:47 2016 +0200
Branches: master
https://developer.blender.org/rB33c83a289d269986678caaf7e90ec6d5b729099a

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.

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

M	intern/cycles/kernel/kernel_compat_cuda.h
M	intern/cycles/kernel/kernel_textures.h

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

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