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/util/util_types.h | |
| parent | ebbb6adf32b91660aab13cf4f5061ae916af0a30 (diff) | |
Code cleanup: some reshuffling of SIMD defines moving more code to util_optimization.h.
Diffstat (limited to 'intern/cycles/util/util_types.h')
| -rw-r--r-- | intern/cycles/util/util_types.h | 58 |
1 files changed, 5 insertions, 53 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 2ee2f0f92e0..ebfd8b6700c 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -57,67 +57,19 @@ #endif -/* SIMD Types */ +/* Standard Integer Types */ #ifndef __KERNEL_GPU__ -#define __KERNEL_SSE2__ - -/* not enabled, globally applying it gives slowdown, only for testing. */ -#if 0 -#define __KERNEL_SSE__ -#ifndef __KERNEL_SSE2__ -#define __KERNEL_SSE2__ -#endif -#ifndef __KERNEL_SSE3__ -#define __KERNEL_SSE3__ -#endif -#ifndef __KERNEL_SSSE3__ -#define __KERNEL_SSSE3__ -#endif -#ifndef __KERNEL_SSE4__ -#define __KERNEL_SSE4__ -#endif -#endif - -/* SSE2 is always available on x86_64 CPUs, so auto enable */ -#if defined(__x86_64__) && !defined(__KERNEL_SSE2__) -#define __KERNEL_SSE2__ -#endif - -/* SSE intrinsics headers */ -#ifndef FREE_WINDOWS64 - -#ifdef __KERNEL_SSE2__ -#include <xmmintrin.h> /* SSE 1 */ -#include <emmintrin.h> /* SSE 2 */ -#endif - -#ifdef __KERNEL_SSE3__ -#include <pmmintrin.h> /* SSE 3 */ -#endif - -#ifdef __KERNEL_SSSE3__ -#include <tmmintrin.h> /* SSSE 3 */ -#endif - -#ifdef __KERNEL_SSE41__ -#include <smmintrin.h> /* SSE 4.1 */ -#endif - -#else - -/* MinGW64 has conflicting declarations for these SSE headers in <windows.h>. - * Since we can't avoid including <windows.h>, better only include that */ -#include <windows.h> - -#endif - /* int8_t, uint16_t, and friends */ #ifndef _WIN32 #include <stdint.h> #endif +/* SIMD Types */ + +#include "util_optimization.h" + #endif CCL_NAMESPACE_BEGIN |