Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2020-11-09 16:41:00 +0300
committerSergey Sharybin <sergey@blender.org>2020-11-09 16:41:00 +0300
commited75a5011975a2ac026f52b06c389c0c06dd7f45 (patch)
treee244a67616d195087a6e76876beaa35fa7c48f47
parent1f4062cf6eff55caaefcf5c915cd56f9fbf00e77 (diff)
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.
-rw-r--r--intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h2
1 files changed, 1 insertions, 1 deletions
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;