diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-04 19:50:37 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-04 19:50:37 +0300 |
| commit | c18e6fd87cdc1a7d07dfcaaab726a67eb81f493f (patch) | |
| tree | 1b9b1d530233dab33056c964682725205e40eb21 /intern/cycles/util/util_math.h | |
| parent | 8bd425188c6379dda1872ada03adf2bbe7f3ec4d (diff) | |
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.
Diffstat (limited to 'intern/cycles/util/util_math.h')
| -rw-r--r-- | intern/cycles/util/util_math.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 97c93516496..7d6dfd34e0e 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; |