[Bf-blender-cvs] [c961737d0f2] master: Cycles: Fix compilation error of filter kernels on 32 bit Windows

[Sergey Sharybin]

Commit: c961737d0f20fec7a1c241372d367b87fe6e4a1e
Author: Sergey Sharybin
Date:   Tue Aug 8 21:56:32 2017 +0200
Branches: master
https://developer.blender.org/rBc961737d0f20fec7a1c241372d367b87fe6e4a1e

Cycles: Fix compilation error of filter kernels on 32 bit Windows

We don't enable global SSE optimizations in regular kernel, and we
keep those disabled on Linux 32bit.

One possible workaround would be to pass arguments by ccl_ref, but
that is quite a few of code which better be done accurately.

===================================================================

M	intern/cycles/kernel/kernels/cpu/filter_sse2.cpp
M	intern/cycles/kernel/kernels/cpu/filter_sse3.cpp

===================================================================

diff --git a/intern/cycles/kernel/kernels/cpu/filter_sse2.cpp b/intern/cycles/kernel/kernels/cpu/filter_sse2.cpp
index a13fb5cd4fb..f7c9935f1d0 100644
--- a/intern/cycles/kernel/kernels/cpu/filter_sse2.cpp
+++ b/intern/cycles/kernel/kernels/cpu/filter_sse2.cpp
@@ -25,7 +25,6 @@
 #else
 /* SSE optimization disabled for now on 32 bit, see bug #36316 */
 #  if !(defined(__GNUC__) && (defined(i386) || defined(_M_IX86)))
-#    define __KERNEL_SSE__
 #    define __KERNEL_SSE2__
 #  endif
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */
diff --git a/intern/cycles/kernel/kernels/cpu/filter_sse3.cpp b/intern/cycles/kernel/kernels/cpu/filter_sse3.cpp
index 6b690adf0f5..070b95a3505 100644
--- a/intern/cycles/kernel/kernels/cpu/filter_sse3.cpp
+++ b/intern/cycles/kernel/kernels/cpu/filter_sse3.cpp
@@ -25,7 +25,6 @@
 #else
 /* SSE optimization disabled for now on 32 bit, see bug #36316 */
 #  if !(defined(__GNUC__) && (defined(i386) || defined(_M_IX86)))
-#    define __KERNEL_SSE__
 #    define __KERNEL_SSE2__
 #    define __KERNEL_SSE3__
 #    define __KERNEL_SSSE3__