diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2015-02-24 01:31:45 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2015-02-24 01:31:45 +0100 |
| commit | b8edd8aedc75ae4e2abd8c5558af94e98c7bebcb (patch) | |
| tree | c6832e8ac25a78ed769b5b76a1d9e19d5b6e2b27 /Source/Core/VideoCommon | |
| parent | 7a61bd5519ccc7a648376f4c6b9a5ab2ca3c75da (diff) | |
| parent | daf4aa09471a0113315fa49aa8409bfc9ba947fd (diff) | |
Merge pull request #2101 from Tilka/intrinsics
Clean up the intrinsics #ifdef mess with a common header
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/TextureDecoder_x64.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoaderX64.cpp | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 9d0b75582f..4a1f0a36a6 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -8,18 +8,12 @@ #include "Common/Common.h" //#include "VideoCommon.h" // to get debug logs #include "Common/CPUDetect.h" +#include "Common/Intrinsics.h" #include "VideoCommon/LookUpTables.h" #include "VideoCommon/TextureDecoder.h" #include "VideoCommon/VideoConfig.h" -#if _M_SSE >= 0x401 -#include <smmintrin.h> -#include <emmintrin.h> -#elif _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__) -#include <tmmintrin.h> -#endif - // This avoids a harmless warning from a system header in Clang; // see http://llvm.org/bugs/show_bug.cgi?id=16093 #if defined(__clang__) && (__clang_major__ * 100 + __clang_minor__ < 304) diff --git a/Source/Core/VideoCommon/VertexLoaderX64.cpp b/Source/Core/VideoCommon/VertexLoaderX64.cpp index 5c962095bd..ae6623db90 100644 --- a/Source/Core/VideoCommon/VertexLoaderX64.cpp +++ b/Source/Core/VideoCommon/VertexLoaderX64.cpp @@ -1,10 +1,5 @@ -#ifdef _MSC_VER -#include <intrin.h> -#else -#include <x86intrin.h> -#endif - #include "Common/CPUDetect.h" +#include "Common/Intrinsics.h" #include "Common/JitRegister.h" #include "Common/x64ABI.h" #include "VideoCommon/VertexLoaderX64.h" |