From 33c83a289d269986678caaf7e90ec6d5b729099a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 15 Aug 2016 16:17:47 +0200 Subject: 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. --- intern/cycles/kernel/kernel_textures.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'intern/cycles/kernel/kernel_textures.h') 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 -- cgit v1.2.3