[Bf-blender-cvs] [b91d64a] master: Cycles: Another attempt to solve CUDA compilation errors on 32bit platforms

Sergey Sharybin noreply at git.blender.org
Tue Jul 21 11:43:21 CEST 2015


Commit: b91d64a3d1209b3e7a96d4fc79b39c58010d890a
Author: Sergey Sharybin
Date:   Tue Jul 21 11:42:32 2015 +0200
Branches: master
https://developer.blender.org/rBb91d64a3d1209b3e7a96d4fc79b39c58010d890a

Cycles: Another attempt to solve CUDA compilation errors on 32bit platforms

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

M	intern/cycles/kernel/kernel_light.h

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

diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index 24d4b01..eb2d39d 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__) && (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);




More information about the Bf-blender-cvs mailing list