diff options
| author | James Zern <jzern@google.com> | 2015-07-24 16:54:51 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-07-31 18:34:20 -0700 |
| commit | fcb4253c9cdaece2dd3a2ab8c6842ed41e24f123 (patch) | |
| tree | a61c7507bfd7c9f36cf2899409c3c883f4f5474b /third_party/libyuv/source/compare_win.cc | |
| parent | f42012e526f218f4607e5d678c5bd44bb5978bff (diff) | |
| download | libvpx-fcb4253c9cdaece2dd3a2ab8c6842ed41e24f123.tar libvpx-fcb4253c9cdaece2dd3a2ab8c6842ed41e24f123.tar.gz libvpx-fcb4253c9cdaece2dd3a2ab8c6842ed41e24f123.tar.bz2 libvpx-fcb4253c9cdaece2dd3a2ab8c6842ed41e24f123.zip | |
update libyuv to r1456
picks up build warning fixes for visual studio 2015
Change-Id: Idea85fa70d1aeb2a46ea355b87fe41ec5b2b9520
Diffstat (limited to 'third_party/libyuv/source/compare_win.cc')
| -rw-r--r-- | third_party/libyuv/source/compare_win.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/third_party/libyuv/source/compare_win.cc b/third_party/libyuv/source/compare_win.cc index e99009a21..19806f275 100644 --- a/third_party/libyuv/source/compare_win.cc +++ b/third_party/libyuv/source/compare_win.cc @@ -16,9 +16,11 @@ namespace libyuv { extern "C" { #endif -#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && defined(_MSC_VER) +// This module is for Visual C x86. +#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && \ + defined(_MSC_VER) && !defined(__clang__) -__declspec(naked) __declspec(align(16)) +__declspec(naked) uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b, int count) { __asm { mov eax, [esp + 4] // src_a @@ -59,7 +61,7 @@ uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b, int count) { #if _MSC_VER >= 1700 // C4752: found Intel(R) Advanced Vector Extensions; consider using /arch:AVX. #pragma warning(disable: 4752) -__declspec(naked) __declspec(align(16)) +__declspec(naked) uint32 SumSquareError_AVX2(const uint8* src_a, const uint8* src_b, int count) { __asm { mov eax, [esp + 4] // src_a @@ -133,7 +135,7 @@ static uvec32 kHashMul3 = { #define pmulld(reg) _asm _emit 0x66 _asm _emit 0x0F _asm _emit 0x38 \ _asm _emit 0x40 _asm _emit reg -__declspec(naked) __declspec(align(16)) +__declspec(naked) uint32 HashDjb2_SSE41(const uint8* src, int count, uint32 seed) { __asm { mov eax, [esp + 4] // src @@ -184,7 +186,7 @@ uint32 HashDjb2_SSE41(const uint8* src, int count, uint32 seed) { // Visual C 2012 required for AVX2. #if _MSC_VER >= 1700 -__declspec(naked) __declspec(align(16)) +__declspec(naked) uint32 HashDjb2_AVX2(const uint8* src, int count, uint32 seed) { __asm { mov eax, [esp + 4] // src @@ -219,8 +221,7 @@ uint32 HashDjb2_AVX2(const uint8* src, int count, uint32 seed) { } } #endif // _MSC_VER >= 1700 - -#endif // !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && defined(_MSC_VER) +#endif // !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) #ifdef __cplusplus } // extern "C" |