commit 489cf8888c3c890ad198da8a002e417078f292b4
author Brian Osman <brianosman@google.com> Tue Jul 09 10:48:28 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 09 15:45:24 2019 +0000
tree fd661f22418b11dae5e47a10812f8d035f7a3704
parent 778ba8a450f47c69c5d76b319cf75127cc451de2

Reland "Make the SkSL interpreter opt-in"

This reverts commit b6b966aa43a917f575394cf696f1addc2335678e.

Change-Id: I58c34fc8520384157c5adb0056f3568b8ef1d844
Bug: skia:9230
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225939
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 8254a00..3bbc66b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -47,6 +47,7 @@
   skia_enable_pdf = true
   skia_enable_spirv_validation = is_skia_dev_build && is_debug
   skia_enable_skpicture = true
+  skia_enable_sksl_interpreter = is_skia_dev_build
   skia_enable_skvm_jit = is_skia_dev_build && target_cpu == "x64" && is_linux
   skia_enable_vulkan_debug_layers = is_skia_dev_build && is_debug
   skia_qt_path = getenv("QT_PATH")
@@ -631,8 +632,7 @@
       if (using_fuchsia_sdk) {
         public_deps += [ "$fuchsia_sdk_root/pkg:vulkan" ]
       } else {
-        public_deps +=
-            [ "//src/graphics/lib/vulkan" ]
+        public_deps += [ "//src/graphics/lib/vulkan" ]
       }
     }
   }
@@ -817,6 +817,11 @@
   ]
 }
 
+optional("sksl_interpreter") {
+  enabled = skia_enable_sksl_interpreter
+  public_defines = [ "SK_ENABLE_SKSL_INTERPRETER" ]
+}
+
 optional("skvm_jit") {
   enabled = skia_enable_skvm_jit
   public_defines = [ "SKVM_JIT" ]
@@ -880,6 +885,7 @@
     ":none",
     ":png",
     ":raw",
+    ":sksl_interpreter",
     ":skvm_jit",
     ":sse2",
     ":sse41",