commit f20c3493eb5774583682560c806de94eea4c2ce4
author Kevin Lubick <kjlubick@google.com> Wed Oct 17 09:46:00 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 17 14:11:51 2018 +0000
tree f980c875fd7c27b35e479024ba6539f04d04b6f9
parent 7bae65d0070c5923abe8d052688b86e41d872f33

[canvaskit] Remove DAA and SAA from gpu build

Bug: skia:
Change-Id: If7f5eaf19fd268613ac883b268b424ca84b9be00
Reviewed-on: https://skia-review.googlesource.com/c/162660
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

experimental/canvaskit/compile.sh

diff --git a/experimental/canvaskit/compile.sh b/experimental/canvaskit/compile.sh
index 9f665c1..8992f0e 100755
--- a/experimental/canvaskit/compile.sh
+++ b/experimental/canvaskit/compile.sh
@@ -22,7 +22,6 @@
 
 RELEASE_CONF="-Oz --closure 1 --llvm-lto 3 -DSK_RELEASE"
 EXTRA_CFLAGS="\"-DSK_RELEASE\""
-
 if [[ $@ == *debug* ]]; then
   echo "Building a Debug build"
   EXTRA_CFLAGS="\"-DSK_DEBUG\""
@@ -35,7 +34,9 @@
 mkdir -p $BUILD_DIR
 
 GN_GPU="skia_enable_gpu=true"
-WASM_GPU="-lEGL -lGLESv2 -DSK_SUPPORT_GPU=1 --pre-js $BASE_DIR/gpu.js"
+GN_GPU_FLAGS="\"-DSK_DISABLE_AAA\", \"-DSK_DISABLE_DAA\", \"-DIS_WEBGL=1\","
+WASM_GPU="-lEGL -lGLESv2 -DSK_SUPPORT_GPU=1 -DSK_DISABLE_AAA -DSK_DISABLE_DAA \
+          --pre-js $BASE_DIR/gpu.js"
 if [[ $@ == *cpu* ]]; then
   echo "Using the CPU backend instead of the GPU backend"
   GN_GPU="skia_enable_gpu=false"
@@ -84,7 +85,8 @@
   cxx=\"${EMCXX}\" \
   extra_cflags_cc=[\"-frtti\"] \
   extra_cflags=[\"-s\",\"USE_FREETYPE=1\",\"-s\",\"USE_LIBPNG=1\", \"-s\", \"WARN_UNALIGNED=1\",
-    \"-DIS_WEBGL=1\", \"-DSKNX_NO_SIMD\",
+    \"-DSKNX_NO_SIMD\",
+    ${GN_GPU_FLAGS}
     ${EXTRA_CFLAGS}
   ] \
   is_debug=false \

src/core/SkScan_AAAPath.cpp

diff --git a/src/core/SkScan_AAAPath.cpp b/src/core/SkScan_AAAPath.cpp
index 16ecb91..bf3d532 100644
--- a/src/core/SkScan_AAAPath.cpp
+++ b/src/core/SkScan_AAAPath.cpp
@@ -25,6 +25,13 @@
 
 #include <utility>
 
+#if defined(SK_DISABLE_AAA)
+void SkScan::AAAFillPath(const SkPath& path, SkBlitter* blitter, const SkIRect& ir,
+                         const SkIRect& clipBounds, bool forceRLE) {
+    SkDEBUGFAIL("AAA Disabled");
+    return;
+}
+#else
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -1715,3 +1722,4 @@
                 containedInClip, false, forceRLE);
     }
 }
+#endif //defined(SK_DISABLE_AAA)

src/core/SkScan_DAAPath.cpp

diff --git a/src/core/SkScan_DAAPath.cpp b/src/core/SkScan_DAAPath.cpp
index a324d75..8f21902 100644
--- a/src/core/SkScan_DAAPath.cpp
+++ b/src/core/SkScan_DAAPath.cpp
@@ -24,6 +24,13 @@
 #include "SkTemplates.h"
 #include "SkUTF.h"
 
+#if defined(SK_DISABLE_DAA)
+void SkScan::DAAFillPath(const SkPath& path, SkBlitter* blitter, const SkIRect& ir,
+                         const SkIRect& clipBounds, bool forceRLE, SkDAARecord* record) {
+    SkDEBUGFAIL("DAA Disabled");
+    return;
+}
+#else
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -384,3 +391,4 @@
         }
     }
 }
+#endif //defined(SK_DISABLE_DAA)