Commit: ed75a5011975a2ac026f52b06c389c0c06dd7f45
Author: Sergey Sharybin
Date: Mon Nov 9 14:41:00 2020 +0100
Branches: master
https://developer.blender.org/rBed75a5011975a2ac026f52b06c389c0c06dd7f45
Cycles: Fix function inline attributes
forceinline attribute is only applicable for function which are
marked inline. Interestingly, it can be used for class methods
without explicit inline statement. But for functions it is another
story.
===================================================================
M intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
===================================================================
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
index b97400a443a..aaf58cbd0ab 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
+++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
@@ -37,7 +37,7 @@ namespace {
} \
(void)0
-ccl_always_inline float frac(float x, int *ix)
+ccl_device_inline float frac(float x, int *ix)
{
int i = float_to_int(x) - ((x < 0.0f) ? 1 : 0);
*ix = i;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
