[Bf-blender-cvs] [7973363] master: Cycles: Final-ish tweaks for 32bit cubin compilation

Sergey Sharybin noreply at git.blender.org
Mon Jul 27 16:59:03 CEST 2015


Commit: 7973363e34167501bfb0707d8d4e31a8ddd3f91b
Author: Sergey Sharybin
Date:   Mon Jul 27 16:55:50 2015 +0200
Branches: master
https://developer.blender.org/rB7973363e34167501bfb0707d8d4e31a8ddd3f91b

Cycles: Final-ish tweaks for 32bit cubin compilation

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

M	intern/cycles/util/util_math.h

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

diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index 2bf62df..97c9351 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -1447,7 +1447,7 @@ ccl_device bool ray_triangle_intersect_uv(
 	return true;
 }
 
-#if defined(__KERNEL_CUDA__) && (defined(i386) || defined(_M_IX86))
+#if defined(__KERNEL_CUDA__) && (defined(i386) || defined(_M_IX86)) && (defined(__KERNEL_EXPERIMENTAL__) || __CUDA_ARCH__ == 500)
 ccl_device_noinline
 #else
 ccl_device




More information about the Bf-blender-cvs mailing list