Commit: ea8e0df672713a7b3ff408242c940e1f5e78c9c1 Author: Lazydodo Date: Fri Aug 16 16:27:15 2019 +0200 Branches: master https://developer.blender.org/rBea8e0df672713a7b3ff408242c940e1f5e78c9c1
Fix T55054: possible use of unsupported instructions in Cycles texture code Differential Revision: https://developer.blender.org/D5326 =================================================================== 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 4289e2bbb85..8f311baf010 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h +++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h @@ -19,6 +19,10 @@ CCL_NAMESPACE_BEGIN +/* Make template functions private so symbols don't conflict between kernels with different + * instruction sets. */ +namespace { + template<typename T> struct TextureInterpolator { #define SET_CUBIC_SPLINE_WEIGHTS(u, t) \ { \ @@ -523,6 +527,8 @@ ccl_device float4 kernel_tex_image_interp_3d( } } +} /* Namespace. */ + CCL_NAMESPACE_END #endif // __KERNEL_CPU_IMAGE_H__ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
