Commit: 2f2a1bbee5eebd2e204160c6dc7106cec0768973 Author: Lukas Stockner Date: Sat Nov 19 02:18:45 2016 +0100 Branches: soc-2016-cycles_denoising https://developer.blender.org/rB2f2a1bbee5eebd2e204160c6dc7106cec0768973
Cycles: Fix optimization includes =================================================================== M intern/cycles/kernel/kernels/cpu/kernel_avx.cpp M intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp M intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp M intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp M intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp =================================================================== diff --git a/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp b/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp index fc7b474..855f404 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp @@ -17,7 +17,9 @@ /* Optimized CPU kernel entry points. This file is compiled with AVX * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ - + +#include "util_optimization.h" + #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_AVX # define KERNEL_STUB #else @@ -32,8 +34,6 @@ # endif #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */ -#include "util_optimization.h" - #include "kernel.h" #define KERNEL_ARCH cpu_avx #include "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 15d57f8..dbed197 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp @@ -18,6 +18,8 @@ * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ +#include "util_optimization.h" + #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 # define KERNEL_STUB #else @@ -33,8 +35,6 @@ # endif #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */ -#include "util_optimization.h" - #include "kernel.h" #define KERNEL_ARCH cpu_avx2 #include "kernel_cpu_impl.h" diff --git a/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp b/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp index 8ab620b..a59547e 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp @@ -18,6 +18,8 @@ * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ +#include "util_optimization.h" + #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 # define KERNEL_STUB #else @@ -27,8 +29,6 @@ # endif #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */ -#include "util_optimization.h" - #include "kernel.h" #define KERNEL_ARCH cpu_sse2 #include "kernel_cpu_impl.h" diff --git a/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp b/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp index cc17e50..ebed420 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp @@ -18,6 +18,8 @@ * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ +#include "util_optimization.h" + #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 # define KERNEL_STUB #else @@ -29,8 +31,6 @@ # endif #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 */ -#include "util_optimization.h" - #include "kernel.h" #define KERNEL_ARCH cpu_sse3 #include "kernel_cpu_impl.h" diff --git a/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp b/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp index 5027911..57d5df1 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp @@ -18,6 +18,8 @@ * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ +#include "util_optimization.h" + #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 # define KERNEL_STUB #else @@ -30,8 +32,6 @@ # endif #endif /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */ -#include "util_optimization.h" - #include "kernel.h" #define KERNEL_ARCH cpu_sse41 #include "kernel_cpu_impl.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
