diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 22:09:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 22:09:10 +0300 |
| commit | cf8add42b807449e6f96f8ecab637d52e166052f (patch) | |
| tree | c6fe3713ea8a1b85eb986dcfb08546772166202e /intern | |
| parent | e673c9dc938844d158abe543457aca8016ef8bc1 (diff) | |
| parent | a4bbce894914837c65f06f466f40e0cc1db7acb9 (diff) | |
Merge branch 'master' into blender2.8
Stupid git handles merges terribly when there are conflicts and branch
is modified buring merge process... :((((
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_opencl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h index 4836c290312..ece99b4313a 100644 --- a/intern/cycles/kernel/kernel_compat_opencl.h +++ b/intern/cycles/kernel/kernel_compat_opencl.h @@ -129,6 +129,7 @@ # define expf(x) native_exp(((float)(x))) # define sqrtf(x) native_sqrt(((float)(x))) # define logf(x) native_log(((float)(x))) +# define rcp(x) native_recip(x) #else # define sinf(x) sin(((float)(x))) # define cosf(x) cos(((float)(x))) @@ -136,6 +137,7 @@ # define expf(x) exp(((float)(x))) # define sqrtf(x) sqrt(((float)(x))) # define logf(x) log(((float)(x))) +# define rcp(x) recip(x)) #endif /* data lookup defines */ |