commit 0d997665e6ddda100889822447e29d1d2bac0b6a
author Ethan Nicholas <ethannicholas@google.com> Mon Apr 08 09:46:01 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 08 16:47:03 2019 +0000
tree b4484c44144a7fc1a32950ce608f5043aa0591c5
parent 7656b2c18ce88e023f7911274535a3df34118817

Revert "Reland "Revert "Reland "GPU support for SkMixers""""

This reverts commit 1263889f3a3ea44db959f043254f4ee9e4014ac9.

Bug: skia:
Change-Id: I647cb228e4a8169f12f4afadaf1db06843e4e5fd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/206391
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLCompiler.cpp

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 4b9709a..9d4238f 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -61,6 +61,10 @@
 #include "sksl_pipeline.inc"
 ;
 
+static const char* SKSL_MIXER_INCLUDE =
+#include "sksl_mixer.inc"
+;
+
 namespace SkSL {
 
 Compiler::Compiler(Flags flags)
@@ -1268,6 +1272,13 @@
                                          strlen(SKSL_PIPELINE_STAGE_INCLUDE), *fTypes, &elements);
             fIRGenerator->fSymbolTable->markAllFunctionsBuiltin();
             break;
+        case Program::kMixer_Kind:
+            inherited = nullptr;
+            fIRGenerator->start(&settings, nullptr);
+            fIRGenerator->convertProgram(kind, SKSL_MIXER_INCLUDE, strlen(SKSL_MIXER_INCLUDE),
+                                         *fTypes, &elements);
+            fIRGenerator->fSymbolTable->markAllFunctionsBuiltin();
+            break;
     }
     for (auto& element : elements) {
         if (element->fKind == ProgramElement::kEnum_Kind) {