kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix Cycles OpenCL textures after recent CUDA fix.

Browse Source 
kernel_textures.h is included in device_opencl.cpp, so we can't check
__KERNEL_OPENCL__ there.
This commit is contained in:
Brecht Van Lommel 2016-08-15 16:17:47 +02:00
parent ad4a01ec0f
commit 33c83a289d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/kernel/kernel_compat_cuda.h
View File

@ -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;

2
intern/cycles/kernel/kernel_textures.h
View File

@ -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