From c93069083eca9e4829c05b2dc8b7c35b4e70f590 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 15 Feb 2016 19:11:02 +0100 Subject: Cycles: Tweaks for 32bit CUDA binaries Tweak some inline policies. Not totally crazy yet, and in fact we now have one less ifdef statement now. --- intern/cycles/kernel/kernel_light.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'intern/cycles/kernel/kernel_light.h') diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h index 1cd701dbf4c..7e09ca3f88e 100644 --- a/intern/cycles/kernel/kernel_light.h +++ b/intern/cycles/kernel/kernel_light.h @@ -620,12 +620,7 @@ ccl_device void lamp_light_sample(KernelGlobals *kg, int lamp, } } -#if defined(__KERNEL_CUDA__) && (__CUDA_ARCH__ >= 500) && (defined(i386) || defined(_M_IX86)) -ccl_device_noinline -#else -ccl_device -#endif -bool lamp_light_eval(KernelGlobals *kg, int lamp, float3 P, float3 D, float t, LightSample *ls) +ccl_device bool lamp_light_eval(KernelGlobals *kg, int lamp, float3 P, float3 D, float t, LightSample *ls) { float4 data0 = kernel_tex_fetch(__light_data, lamp*LIGHT_SIZE + 0); float4 data1 = kernel_tex_fetch(__light_data, lamp*LIGHT_SIZE + 1); -- cgit v1.2.3