From 559a1611b1b326afeda0ef9b6696857287e6275e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 11 May 2017 21:14:28 -0500 Subject: [PATCH] Just disable Jumper for tvOS --- BUILD.gn | 2 +- src/jumper/SkJumper.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index c1f7277..5764026 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -29,7 +29,7 @@ declare_args() { skia_enable_android_framework_defines = false skia_enable_discrete_gpu = true skia_enable_effects = true - skia_enable_jumper = false + skia_enable_jumper = is_skia_standalone && !is_tvos # jumper does not yet support bitcode skia_enable_gpu = true skia_enable_pdf = true skia_enable_tools = is_skia_standalone diff --git a/src/jumper/SkJumper.cpp b/src/jumper/SkJumper.cpp index 488caf6..1d271aa 100644 --- a/src/jumper/SkJumper.cpp +++ b/src/jumper/SkJumper.cpp @@ -103,7 +103,7 @@ using StageFn = void(void); extern "C" { -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) || SK_BUILD_FOR_TVOS // We'll just run portable code. #elif defined(__aarch64__) @@ -155,7 +155,7 @@ extern "C" { // Translate SkRasterPipeline's StockStage enum to StageFn function pointers. -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) || SK_BUILD_FOR_TVOS // We'll just run portable code. #elif defined(__aarch64__) @@ -271,7 +271,7 @@ bool SkRasterPipeline::run_with_jumper(size_t x, size_t n) const { }; // While possible, build and run at full vector stride. -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) || SK_BUILD_FOR_TVOS // We'll just run portable code. #elif defined(__aarch64__) -- 2.7.4