From 72a9e282ecf848a5578f1e5983f0bb56a6c24fa6 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 9 Nov 2015 17:20:02 -0800 Subject: [PATCH] disable more avx2 functions that dont link in chrome libyuv builds/runs, but when integrated into chromium, produces link errors. unclear why but this disables affected functions. will followup with re-enabling them once the root cause in the runtime error is found. TBR=harryjin@google.com BUG=libyuv:522 Review URL: https://codereview.chromium.org/1427683004 . --- README.chromium | 2 +- include/libyuv/row.h | 6 +++--- include/libyuv/version.h | 2 +- source/row_any.cc | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.chromium b/README.chromium index fd4a35f7c..7a5c0d57f 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1534 +Version: 1535 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index dfae397f2..888021043 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -241,9 +241,9 @@ extern "C" { #define HAS_ARGBTOARGB4444ROW_AVX2 #define HAS_ARGBTORGB565ROW_AVX2 #define HAS_I411TOARGBROW_AVX2 -#define HAS_I422TOARGB1555ROW_AVX2 -#define HAS_I422TOARGB4444ROW_AVX2 -#define HAS_I422TORGB565ROW_AVX2 +// #define HAS_I422TOARGB1555ROW_AVX2 +// #define HAS_I422TOARGB4444ROW_AVX2 +// #define HAS_I422TORGB565ROW_AVX2 #define HAS_I444TOARGBROW_AVX2 #define HAS_J400TOARGBROW_AVX2 #define HAS_NV12TORGB565ROW_AVX2 diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 8e2a7fbb7..a30b7c8a7 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1534 +#define LIBYUV_VERSION 1535 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_any.cc b/source/row_any.cc index fe7f4813f..f6a579ca9 100644 --- a/source/row_any.cc +++ b/source/row_any.cc @@ -317,8 +317,10 @@ ANY11(ARGBToRGB565Row_Any_SSE2, ARGBToRGB565Row_SSE2, 0, 4, 2, 3) ANY11(ARGBToARGB1555Row_Any_SSE2, ARGBToARGB1555Row_SSE2, 0, 4, 2, 3) ANY11(ARGBToARGB4444Row_Any_SSE2, ARGBToARGB4444Row_SSE2, 0, 4, 2, 3) #endif -#if defined(HAS_ARGBTOARGB4444ROW_AVX2) +#if defined(HAS_ARGBTORGB565ROW_AVX2) ANY11(ARGBToRGB565Row_Any_AVX2, ARGBToRGB565Row_AVX2, 0, 4, 2, 7) +#endif +#if defined(HAS_ARGBTOARGB4444ROW_AVX2) ANY11(ARGBToARGB1555Row_Any_AVX2, ARGBToARGB1555Row_AVX2, 0, 4, 2, 7) ANY11(ARGBToARGB4444Row_Any_AVX2, ARGBToARGB4444Row_AVX2, 0, 4, 2, 7) #endif