[Bf-blender-cvs] [5e2f9c5c67f] master: Cycles: Cleanup: Remove duplicated atan2f definition for OpenCL
Lukas Stockner
noreply at git.blender.org
Thu May 24 19:12:00 CEST 2018
Commit: 5e2f9c5c67f5c1673553bd1e07586ba85fcb8df9
Author: Lukas Stockner
Date: Thu May 24 19:06:50 2018 +0200
Branches: master
https://developer.blender.org/rB5e2f9c5c67f5c1673553bd1e07586ba85fcb8df9
Cycles: Cleanup: Remove duplicated atan2f definition for OpenCL
Turns out that atan2f was already defined for OpenCL.
===================================================================
M intern/cycles/kernel/kernel_compat_opencl.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h
index ff7b69ab08f..671c47e2225 100644
--- a/intern/cycles/kernel/kernel_compat_opencl.h
+++ b/intern/cycles/kernel/kernel_compat_opencl.h
@@ -116,7 +116,6 @@
#define asinf(x) asin(((float)(x)))
#define acosf(x) acos(((float)(x)))
#define atanf(x) atan(((float)(x)))
-#define atan2f(x, y) atan2(((float)(x)), ((float)(y)))
#define floorf(x) floor(((float)(x)))
#define ceilf(x) ceil(((float)(x)))
#define hypotf(x, y) hypot(((float)(x)), ((float)(y)))
More information about the Bf-blender-cvs
mailing list