mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 1698699 - P4 - update line numbers for fix_build_errors.patch;r=mjf
Differential Revision: https://phabricator.services.mozilla.com/D150304
This commit is contained in:
parent
84af2c76e0
commit
687962e932
@ -5,7 +5,7 @@
|
||||
diff --git a/media/libyuv/libyuv/include/libyuv/row.h b/media/libyuv/libyuv/include/libyuv/row.h
|
||||
--- a/media/libyuv/libyuv/include/libyuv/row.h
|
||||
+++ b/media/libyuv/libyuv/include/libyuv/row.h
|
||||
@@ -154,18 +154,19 @@ extern "C" {
|
||||
@@ -174,19 +174,20 @@ extern "C" {
|
||||
#define HAS_SOBELROW_SSE2
|
||||
#define HAS_SOBELTOPLANEROW_SSE2
|
||||
#define HAS_SOBELXROW_SSE2
|
||||
@ -22,30 +22,21 @@ diff --git a/media/libyuv/libyuv/include/libyuv/row.h b/media/libyuv/libyuv/incl
|
||||
// TODO(fbarchard): fix build error on android_full_debug=1
|
||||
// https://code.google.com/p/libyuv/issues/detail?id=517
|
||||
#define HAS_I422ALPHATOARGBROW_SSSE3
|
||||
#define HAS_I444ALPHATOARGBROW_SSSE3
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// The following are available on all x86 platforms, but
|
||||
// require VS2012, clang 3.4 or gcc 4.7.
|
||||
@@ -215,18 +216,19 @@ extern "C" {
|
||||
// Effects:
|
||||
#define HAS_ARGBADDROW_AVX2
|
||||
#define HAS_ARGBATTENUATEROW_AVX2
|
||||
#define HAS_ARGBMULTIPLYROW_AVX2
|
||||
#define HAS_ARGBSUBTRACTROW_AVX2
|
||||
@@ -248,8 +249,9 @@ extern "C" {
|
||||
#define HAS_ARGBUNATTENUATEROW_AVX2
|
||||
#define HAS_BLENDPLANEROW_AVX2
|
||||
|
||||
|
||||
-#if defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
|
||||
- defined(_MSC_VER)
|
||||
+#if !defined(MOZ_PROFILING) && \
|
||||
+ (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
|
||||
+ (defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
|
||||
+ defined(_MSC_VER))
|
||||
// TODO(fbarchard): fix build error on android_full_debug=1
|
||||
// https://code.google.com/p/libyuv/issues/detail?id=517
|
||||
#define HAS_I422ALPHATOARGBROW_AVX2
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// The following are available for AVX2 Visual C and clangcl 32 bit:
|
||||
// TODO(fbarchard): Port to gcc.
|
||||
|
Loading…
Reference in New Issue
Block a user