From 12e4103bdd7be6dfe867e64ef510db1fafc8a90d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 9 Sep 2015 18:23:20 +0500 Subject: Cycles: Attempt to fix 32bit CUDA kernels --- intern/cycles/kernel/kernel_light.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'intern') diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h index 24d4b01302c..7590ec2d706 100644 --- a/intern/cycles/kernel/kernel_light.h +++ b/intern/cycles/kernel/kernel_light.h @@ -620,7 +620,12 @@ ccl_device void lamp_light_sample(KernelGlobals *kg, int lamp, } } -ccl_device bool lamp_light_eval(KernelGlobals *kg, int lamp, float3 P, float3 D, float t, LightSample *ls) +#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) { 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