diff options
| author | Frank Barchard <fbarchard@google.com> | 2021-04-21 18:59:53 -0700 |
|---|---|---|
| committer | Frank Barchard <fbarchard@chromium.org> | 2021-04-22 19:32:32 +0000 |
| commit | 5e05f26a2bcacc5d34ee5786e25efee2493003cc (patch) | |
| tree | 39fe5cec7ee475d2501bb3250a7713cb604e4f24 /include/libyuv/scale_row.h | |
| parent | 8c8d907d29255ae0630f414e0e09ee9cca8f4bfc (diff) | |
| download | libyuv-5e05f26a2bcacc5d34ee5786e25efee2493003cc.tar.gz | |
Switch win32 to row_gcc for clangcl.
Bug: libyuv:900, libyuv:848, b/178283356, b/185922513
Change-Id: I7697953753391c555a778198db36412c853fb29e
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2844962
Reviewed-by: richard winterton <rrwinterton@gmail.com>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Diffstat (limited to 'include/libyuv/scale_row.h')
| -rw-r--r-- | include/libyuv/scale_row.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/libyuv/scale_row.h b/include/libyuv/scale_row.h index 63af79b3..833af1c4 100644 --- a/include/libyuv/scale_row.h +++ b/include/libyuv/scale_row.h @@ -19,9 +19,7 @@ namespace libyuv { extern "C" { #endif -// TODO: Fix Win32 build -// https://bugs.chromium.org/p/libyuv/issues/detail?id=900 -#if defined(__pnacl__) || defined(__CLR_VER) || defined(_M_IX86) || \ +#if defined(__pnacl__) || defined(__CLR_VER) || \ (defined(__native_client__) && defined(__x86_64__)) || \ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 @@ -77,7 +75,7 @@ extern "C" { // The following are available for gcc/clang x86 platforms: // TODO(fbarchard): Port to Visual C #if !defined(LIBYUV_DISABLE_X86) && \ - (defined(__x86_64__) || (defined(__i386__) && !defined(_MSC_VER))) + (defined(__x86_64__) || defined(__i386__)) #define HAS_SCALEUVROWDOWN2BOX_SSSE3 #define HAS_SCALEROWUP2LINEAR_SSE2 #define HAS_SCALEROWUP2LINEAR_SSSE3 @@ -96,8 +94,8 @@ extern "C" { // The following are available for gcc/clang x86 platforms, but // require clang 3.4 or gcc 4.7. // TODO(fbarchard): Port to Visual C -#if !defined(LIBYUV_DISABLE_X86) && \ - (defined(__x86_64__) || defined(__i386__)) && !defined(_MSC_VER) && \ +#if !defined(LIBYUV_DISABLE_X86) && \ + (defined(__x86_64__) || defined(__i386__)) && \ (defined(CLANG_HAS_AVX2) || defined(GCC_HAS_AVX2)) #define HAS_SCALEUVROWDOWN2BOX_AVX2 #define HAS_SCALEROWUP2LINEAR_AVX2 |