[Bf-blender-cvs] [8d73ba58b69] master: Cycles: Fix compilation of sm_20 and sm_21 kernels
Sergey Sharybin
noreply at git.blender.org
Tue Oct 10 09:27:24 CEST 2017
Commit: 8d73ba58b6935e8cb4e0d48ecb84d47521f4c61b
Author: Sergey Sharybin
Date: Tue Oct 10 12:26:02 2017 +0500
Branches: master
https://developer.blender.org/rB8d73ba58b6935e8cb4e0d48ecb84d47521f4c61b
Cycles: Fix compilation of sm_20 and sm_21 kernels
Was broken since the bicubic commit for GPU support.
===================================================================
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 269e74f6164..b7be4fe4409 100644
--- a/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h
+++ b/intern/cycles/kernel/kernels/cuda/kernel_cuda_image.h
@@ -293,7 +293,7 @@ ccl_device float4 kernel_tex_image_interp(KernelGlobals *kg, int id, float x, fl
return r;
}
-ccl_device float4 kernel_tex_image_interp_3d(KernelGlobals *kg, int id, float x, float y, float z)
+ccl_device float4 kernel_tex_image_interp_3d(KernelGlobals *kg, int id, float x, float y, float z, InterpolationType interp)
{
float4 r;
switch(id) {
More information about the Bf-blender-cvs
mailing list