[Bf-blender-cvs] [c18e6fd] master: Cycles: Remove 32bit cuda workaroudn and disable cubins for buildbot

Sergey Sharybin noreply at git.blender.org
Tue Aug 4 18:56:05 CEST 2015


Commit: c18e6fd87cdc1a7d07dfcaaab726a67eb81f493f
Author: Sergey Sharybin
Date:   Tue Aug 4 18:50:37 2015 +0200
Branches: master
https://developer.blender.org/rBc18e6fd87cdc1a7d07dfcaaab726a67eb81f493f

Cycles: Remove 32bit cuda workaroudn and disable cubins for buildbot

Recent changes to kernel broke compilation of the kernels again, need some
other kind of solution for this issue.

Don't have much time for this currently, but will be addressed before the
release.

Meanwhile it's better to have some buildbot builds instead of totally failing
one.

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

M	build_files/buildbot/config/user-config-cuda-glibc211-i686.py
M	intern/cycles/kernel/kernel_light.h
M	intern/cycles/util/util_math.h

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

diff --git a/build_files/buildbot/config/user-config-cuda-glibc211-i686.py b/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
index ae5cbac..580e67e 100644
--- a/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
+++ b/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
@@ -2,4 +2,5 @@ BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
 BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
 BF_NUMJOBS = 1
 
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50', 'sm_52']
+#BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50', 'sm_52']
+BF_CYCLES_CUDA_BINARIES_ARCH = []
diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index eb2d39d..24d4b01 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__) && (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);
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index 97c9351..7d6dfd3 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -1447,14 +1447,9 @@ ccl_device bool ray_triangle_intersect_uv(
 	return true;
 }
 
-#if defined(__KERNEL_CUDA__) && (defined(i386) || defined(_M_IX86)) && (defined(__KERNEL_EXPERIMENTAL__) || __CUDA_ARCH__ == 500)
-ccl_device_noinline
-#else
-ccl_device
-#endif
-bool ray_quad_intersect(float3 ray_P, float3 ray_D, float ray_t,
-                        float3 quad_P, float3 quad_u, float3 quad_v,
-                        float3 *isect_P, float *isect_t)
+ccl_device bool ray_quad_intersect(float3 ray_P, float3 ray_D, float ray_t,
+                                   float3 quad_P, float3 quad_u, float3 quad_v,
+                                   float3 *isect_P, float *isect_t)
 {
 	float3 v0 = quad_P - quad_u*0.5f - quad_v*0.5f;
 	float3 v1 = quad_P + quad_u*0.5f - quad_v*0.5f;




More information about the Bf-blender-cvs mailing list