diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-15 18:11:50 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-15 18:11:50 +0400 |
| commit | 8af782ad22c42654d23ca6379f105af8d98956cc (patch) | |
| tree | 0675da25547f48d984e3c522b7fb380d43f2ea15 /intern/cycles/kernel | |
| parent | ebbb6adf32b91660aab13cf4f5061ae916af0a30 (diff) | |
Code cleanup: some reshuffling of SIMD defines moving more code to util_optimization.h.
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/kernel.h | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_sse2.cpp | 8 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_sse3.cpp | 8 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_sse41.cpp | 8 |
4 files changed, 12 insertions, 13 deletions
diff --git a/intern/cycles/kernel/kernel.h b/intern/cycles/kernel/kernel.h index b6db92f26e9..01bea10c1e7 100644 --- a/intern/cycles/kernel/kernel.h +++ b/intern/cycles/kernel/kernel.h @@ -20,7 +20,6 @@ /* CPU Kernel Interface */ #include "util_types.h" -#include "util_optimization.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/kernel_sse2.cpp b/intern/cycles/kernel/kernel_sse2.cpp index 6f3f1714cbf..6a2a7804146 100644 --- a/intern/cycles/kernel/kernel_sse2.cpp +++ b/intern/cycles/kernel/kernel_sse2.cpp @@ -17,16 +17,16 @@ /* Optimized CPU kernel entry points. This file is compiled with SSE2 * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ - -#include "util_optimization.h" - -#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 /* SSE optimization disabled for now on 32 bit, see bug #36316 */ #if !(defined(__GNUC__) && (defined(i386) || defined(_M_IX86))) #define __KERNEL_SSE2__ #endif +#include "util_optimization.h" + +#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 + #include "kernel.h" #include "kernel_compat_cpu.h" #include "kernel_math.h" diff --git a/intern/cycles/kernel/kernel_sse3.cpp b/intern/cycles/kernel/kernel_sse3.cpp index e6760981eef..9d0abb93cc6 100644 --- a/intern/cycles/kernel/kernel_sse3.cpp +++ b/intern/cycles/kernel/kernel_sse3.cpp @@ -17,10 +17,6 @@ /* Optimized CPU kernel entry points. This file is compiled with SSE3/SSSE3 * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ - -#include "util_optimization.h" - -#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 /* SSE optimization disabled for now on 32 bit, see bug #36316 */ #if !(defined(__GNUC__) && (defined(i386) || defined(_M_IX86))) @@ -29,6 +25,10 @@ #define __KERNEL_SSSE3__ #endif +#include "util_optimization.h" + +#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 + #include "kernel.h" #include "kernel_compat_cpu.h" #include "kernel_math.h" diff --git a/intern/cycles/kernel/kernel_sse41.cpp b/intern/cycles/kernel/kernel_sse41.cpp index fd2198aebda..bc20de0ec20 100644 --- a/intern/cycles/kernel/kernel_sse41.cpp +++ b/intern/cycles/kernel/kernel_sse41.cpp @@ -17,10 +17,6 @@ /* Optimized CPU kernel entry points. This file is compiled with SSE3/SSSE3 * optimization flags and nearly all functions inlined, while kernel.cpp * is compiled without for other CPU's. */ - -#include "util_optimization.h" - -#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 /* SSE optimization disabled for now on 32 bit, see bug #36316 */ #if !(defined(__GNUC__) && (defined(i386) || defined(_M_IX86))) @@ -30,6 +26,10 @@ #define __KERNEL_SSE41__ #endif +#include "util_optimization.h" + +#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 + #include "kernel.h" #include "kernel_compat_cpu.h" #include "kernel_math.h" |