diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-11-08 18:29:56 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-11-08 18:29:56 +0300 |
| commit | aa9b976e9f9b8baff194f5bfadcf9e7694cf8d15 (patch) | |
| tree | b30ce7abaa65be85c147222cb074571c056b59df /intern/cycles/kernel/device/cpu/kernel.cpp | |
| parent | 410b87ca781d6b6b061bab0440005ac1ab82688f (diff) | |
| parent | bbb1d3e5e7eb4059a0324ae786e1e793852963a9 (diff) | |
Merge branch 'master' into temp-gpencil-automasktemp-gpencil-automask
Diffstat (limited to 'intern/cycles/kernel/device/cpu/kernel.cpp')
| -rw-r--r-- | intern/cycles/kernel/device/cpu/kernel.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/intern/cycles/kernel/device/cpu/kernel.cpp b/intern/cycles/kernel/device/cpu/kernel.cpp index 01087c96dd6..558431961ab 100644 --- a/intern/cycles/kernel/device/cpu/kernel.cpp +++ b/intern/cycles/kernel/device/cpu/kernel.cpp @@ -7,6 +7,7 @@ * one with SSE2 intrinsics. */ #if defined(__x86_64__) || defined(_M_X64) +# define __KERNEL_SSE__ # define __KERNEL_SSE2__ #endif @@ -29,11 +30,15 @@ # define __KERNEL_SSE41__ # endif # ifdef __AVX__ -# define __KERNEL_SSE__ +# ifndef __KERNEL_SSE__ +# define __KERNEL_SSE__ +# endif # define __KERNEL_AVX__ # endif # ifdef __AVX2__ -# define __KERNEL_SSE__ +# ifndef __KERNEL_SSE__ +# define __KERNEL_SSE__ +# endif # define __KERNEL_AVX2__ # endif #endif |