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:
authorBrecht Van Lommel <brecht@blender.org>2021-03-08 15:59:16 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-03-08 16:06:16 +0300
commit3669a3e2e95ca0dc63afec69e49a4b99cc2ab5c2 (patch)
tree42b792709eec5738bc0cd877d897728e5678a253
parent240e721dd363dd894f585f33bfe6a9971cd7660a (diff)
Fix Cycles CUDA build error with Visual Studio 2019 v16.9
Something in this update broke the floor() function in CUDA, instead use floorf() like we do everywhere else in the kernel code. Thanks to Ray Molenkamp for identifying the solution.
-rw-r--r--intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h b/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h
index 82ad9225fc3..132653fa7ca 100644
--- a/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h
+++ b/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h
@@ -68,8 +68,8 @@ ccl_device T kernel_tex_image_interp_bicubic(const TextureInfo &info, float x, f
x = (x * info.width) - 0.5f;
y = (y * info.height) - 0.5f;
- float px = floor(x);
- float py = floor(y);
+ float px = floorf(x);
+ float py = floorf(y);
float fx = x - px;
float fy = y - py;
@@ -95,9 +95,9 @@ ccl_device T kernel_tex_image_interp_tricubic(const TextureInfo &info, float x,
y = (y * info.height) - 0.5f;
z = (z * info.depth) - 0.5f;
- float px = floor(x);
- float py = floor(y);
- float pz = floor(z);
+ float px = floorf(x);
+ float py = floorf(y);
+ float pz = floorf(z);
float fx = x - px;
float fy = y - py;
float fz = z - pz;
@@ -127,9 +127,9 @@ ccl_device T kernel_tex_image_interp_tricubic(const TextureInfo &info, float x,
template<typename T, typename S>
ccl_device T kernel_tex_image_interp_tricubic_nanovdb(S &s, float x, float y, float z)
{
- float px = floor(x);
- float py = floor(y);
- float pz = floor(z);
+ float px = floorf(x);
+ float py = floorf(y);
+ float pz = floorf(z);
float fx = x - px;
float fy = y - py;
float fz = z - pz;