diff options
-rw-r--r-- | external/skia/UnpackedTarball_skia.mk | 1 | ||||
-rw-r--r-- | external/skia/clang11-flax-vector-conversion.patch.0 | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index b931aefd8618..ae90f26fe15b 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -18,7 +18,6 @@ skia_patches := \ no-trace-resources-on-exit.patch.1 \ fix-alpha-difference-copy.patch.1 \ share-grcontext.patch.1 \ - clang11-flax-vector-conversion.patch.0 \ clang-attributes-warning.patch.1 \ fontconfig-get-typeface.patch.0 \ windows-do-not-modify-logfont.patch.0 \ diff --git a/external/skia/clang11-flax-vector-conversion.patch.0 b/external/skia/clang11-flax-vector-conversion.patch.0 deleted file mode 100644 index aebe66c907d6..000000000000 --- a/external/skia/clang11-flax-vector-conversion.patch.0 +++ /dev/null @@ -1,11 +0,0 @@ ---- src/opts/SkRasterPipeline_opts.h -+++ src/opts/SkRasterPipeline_opts.h -@@ -43,7 +43,7 @@ - - using NoCtx = const void*; - --#if !defined(__clang__) -+#if !defined(__clang__) || __clang_major__ >= 11 - #define JUMPER_IS_SCALAR - #elif defined(SK_ARM_HAS_NEON) - #define JUMPER_IS_NEON |