[Bf-blender-cvs] [5faa6893e34] cycles_texture_cache: Cycles: Fixed texture cache build in Visual Studio - need to tell OIIO to disable AVX

[Stefan Werner]

Commit: 5faa6893e34064c8744fb56f0e73d315a882f3c3
Author: Stefan Werner
Date:   Tue May 9 13:47:58 2017 +0200
Branches: cycles_texture_cache
https://developer.blender.org/rB5faa6893e34064c8744fb56f0e73d315a882f3c3

Cycles: Fixed texture cache build in Visual Studio - need to tell OIIO to disable AVX

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

M	intern/cycles/kernel/kernels/cpu/kernel_avx.cpp
M	intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp

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

diff --git a/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp b/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp
index a645fb4d8dd..c9665c8182b 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp
@@ -34,6 +34,8 @@
 #  endif
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */
 
+#define OIIO_NO_AVX 1
+
 #include "kernel/kernel.h"
 #define KERNEL_ARCH cpu_avx
 #include "kernel/kernels/cpu/kernel_cpu_impl.h"
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp b/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp
index 6bbb87727b9..91907f845a5 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp
@@ -35,6 +35,8 @@
 #  endif
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */
 
+#define OIIO_NO_AVX 1
+
 #include "kernel/kernel.h"
 #define KERNEL_ARCH cpu_avx2
 #include "kernel/kernels/cpu/kernel_cpu_impl.h"