diff options
| author | Daniel Stokes <kupomail@gmail.com> | 2013-10-14 00:59:55 +0400 |
|---|---|---|
| committer | Daniel Stokes <kupomail@gmail.com> | 2013-10-14 00:59:55 +0400 |
| commit | 0aa392d2ff4cc29f2e53485a6456a7deb838e1bb (patch) | |
| tree | 50aa44367f0df077be6115c1f9deb85656018d4d /intern/cycles/kernel/kernel_sse3.cpp | |
| parent | 6167313105cd0b65ba777459ce9333ac51e0cb3b (diff) | |
| parent | 2ce3bd0d672e7e26e1a8710444872ad6478a7565 (diff) | |
Merged revisions 60248-60717 from trunk/blendersoc-2013-bge
Diffstat (limited to 'intern/cycles/kernel/kernel_sse3.cpp')
| -rw-r--r-- | intern/cycles/kernel/kernel_sse3.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_sse3.cpp b/intern/cycles/kernel/kernel_sse3.cpp index c44098606a5..05877a41b4a 100644 --- a/intern/cycles/kernel/kernel_sse3.cpp +++ b/intern/cycles/kernel/kernel_sse3.cpp @@ -20,9 +20,12 @@ #ifdef WITH_OPTIMIZED_KERNEL +/* 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 #include "kernel.h" #include "kernel_compat_cpu.h" |