[Bf-blender-cvs] [480b814] master: Cycles: Remove back some tweaks for inline policies
Sergey Sharybin
noreply at git.blender.org
Tue Feb 16 17:27:03 CET 2016
Commit: 480b814e029e72ce790737741aca3f123666bd8a
Author: Sergey Sharybin
Date: Tue Feb 16 17:25:58 2016 +0100
Branches: master
https://developer.blender.org/rB480b814e029e72ce790737741aca3f123666bd8a
Cycles: Remove back some tweaks for inline policies
While kernel compiles fine, it seems generated binary is not really correct.
===================================================================
M intern/cycles/kernel/kernel_accumulate.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h
index 4c75176..29eca86 100644
--- a/intern/cycles/kernel/kernel_accumulate.h
+++ b/intern/cycles/kernel/kernel_accumulate.h
@@ -55,7 +55,7 @@ ccl_device_inline void bsdf_eval_init(BsdfEval *eval, ClosureType type, float3 v
}
/* TODO(sergey): This is just a workaround for annoying 6.5 compiler bug. */
-#if !defined(__KERNEL_CUDA__) || __CUDA_ARCH__ < 520
+#if !defined(__KERNEL_CUDA__) || __CUDA_ARCH__ < 500
ccl_device_inline
#else
ccl_device_noinline
More information about the Bf-blender-cvs
mailing list