From c28d4049364d75710b1c49697a5814ab572af641 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Thu, 28 Jan 2021 23:54:38 -0800 Subject: [PATCH] win32 build fix for I422ToRGBA Bug: libyuv:877, b/178713286 Change-Id: Iad55df99083b9a4bb9306e052e0e687e58570d96 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2657701 Reviewed-by: Mirko Bonadei Reviewed-by: Frank Barchard --- source/row_any.cc | 12 +++++++++++- source/row_gcc.cc | 7 +------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/source/row_any.cc b/source/row_any.cc index c88d9a23a..57c39d5d4 100644 --- a/source/row_any.cc +++ b/source/row_any.cc @@ -219,10 +219,20 @@ ANY31(BlendPlaneRow_Any_MMI, BlendPlaneRow_MMI, 0, 0, 1, 7) #ifdef HAS_I422TOARGBROW_SSSE3 ANY31C(I422ToARGBRow_Any_SSSE3, I422ToARGBRow_SSSE3, 1, 0, 4, 7) +#endif +#ifdef HAS_I422TORGBAROW_SSSE3 ANY31C(I422ToRGBARow_Any_SSSE3, I422ToRGBARow_SSSE3, 1, 0, 4, 7) +#endif +#ifdef HAS_I422TOARGB4444ROW_SSSE3 ANY31C(I422ToARGB4444Row_Any_SSSE3, I422ToARGB4444Row_SSSE3, 1, 0, 2, 7) +#endif +#ifdef HAS_I422TOARGB1555ROW_SSSE3 ANY31C(I422ToARGB1555Row_Any_SSSE3, I422ToARGB1555Row_SSSE3, 1, 0, 2, 7) +#endif +#ifdef HAS_I422TORGB565ROW_SSSE3 ANY31C(I422ToRGB565Row_Any_SSSE3, I422ToRGB565Row_SSSE3, 1, 0, 2, 7) +#endif +#ifdef HAS_I422TORGB24ROW_SSSE3 ANY31C(I422ToRGB24Row_Any_SSSE3, I422ToRGB24Row_SSSE3, 1, 0, 3, 15) #endif #ifdef HAS_I422TOAR30ROW_SSSE3 @@ -233,7 +243,7 @@ ANY31C(I422ToAR30Row_Any_AVX2, I422ToAR30Row_AVX2, 1, 0, 4, 15) #endif #ifdef HAS_I444TOARGBROW_SSSE3 ANY31C(I444ToARGBRow_Any_SSSE3, I444ToARGBRow_SSSE3, 0, 0, 4, 7) -#endif // HAS_I444TOARGBROW_SSSE3 +#endif #ifdef HAS_I422TORGB24ROW_AVX2 ANY31C(I422ToRGB24Row_Any_AVX2, I422ToRGB24Row_AVX2, 1, 0, 3, 31) #endif diff --git a/source/row_gcc.cc b/source/row_gcc.cc index 8fd4e15aa..f91110034 100644 --- a/source/row_gcc.cc +++ b/source/row_gcc.cc @@ -5990,12 +5990,7 @@ void ARGBMultiplyRow_AVX2(const uint8_t* src_argb0, "+r"(dst_argb), // %2 "+r"(width) // %3 : - : "memory", "cc" -#if defined(__AVX2__) - - "xmm0", "xmm1", "xmm2", "xmm3", "xmm5" -#endif - ); + : "memory", "cc", "xmm0", "xmm1", "xmm2", "xmm3", "xmm5"); } #endif // HAS_ARGBMULTIPLYROW_AVX2