[Bf-blender-cvs] [052156a646a] blender-v2.83-release: Fix Cycles CUDA build error with Visual Studio 2019 v16.9

Brecht Van Lommel noreply at git.blender.org
Mon Mar 8 14:16:54 CET 2021


Commit: 052156a646a2b5a045dabc13d76a269ef35381a9
Author: Brecht Van Lommel
Date:   Mon Mar 8 13:59:16 2021 +0100
Branches: blender-v2.83-release
https://developer.blender.org/rB052156a646a2b5a045dabc13d76a269ef35381a9

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.

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

M	intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h

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

diff --git a/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h b/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h
index 1d425d132a1..eff1784cda0 100644
--- a/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h
+++ b/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h
@@ -66,8 +66,8 @@ kernel_tex_image_interp_bicubic(const TextureInfo &info, CUtexObject tex, float
   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;
 
@@ -91,9 +91,9 @@ ccl_device T kernel_tex_image_interp_bicubic_3d(
   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;



More information about the Bf-blender-cvs mailing list