diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-05-08 01:19:22 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-05-08 01:19:22 +0300 |
| commit | 9181f13af710f39e28368461f9979ce2052a55ee (patch) | |
| tree | bb4dae8ee41e31d25ba980aa996c3e62539a59e0 /intern/cycles/kernel/kernels/cpu/kernel_split_sse3.cpp | |
| parent | c47926542acf1fc342b4d0b8f7ccaf1e3a8be6d8 (diff) | |
| parent | ce28025eaf5014f16460dd1cb798ce5292087d94 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/kernel/kernels/cpu/kernel_split_sse3.cpp')
| -rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel_split_sse3.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_split_sse3.cpp b/intern/cycles/kernel/kernels/cpu/kernel_split_sse3.cpp index 13d00813591..3e5792d0b17 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_split_sse3.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel_split_sse3.cpp @@ -18,19 +18,21 @@ * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ -/* SSE optimization disabled for now on 32 bit, see bug #36316 */ -#if !(defined(__GNUC__) && (defined(i386) || defined(_M_IX86))) -# define __KERNEL_SSE2__ -# define __KERNEL_SSE3__ -# define __KERNEL_SSSE3__ -#endif - #define __SPLIT_KERNEL__ #include "util/util_optimization.h" -#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 -# include "kernel/kernel.h" -# define KERNEL_ARCH cpu_sse3 -# include "kernel/kernels/cpu/kernel_cpu_impl.h" +#ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 +# define KERNEL_STUB +#else +/* SSE optimization disabled for now on 32 bit, see bug #36316 */ +# if !(defined(__GNUC__) && (defined(i386) || defined(_M_IX86))) +# define __KERNEL_SSE2__ +# define __KERNEL_SSE3__ +# define __KERNEL_SSSE3__ +# endif #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 */ + +#include "kernel/kernel.h" +#define KERNEL_ARCH cpu_sse3 +#include "kernel/kernels/cpu/kernel_cpu_impl.h" |