commit 91164d1c0118f39fd72d84c900fc28b0abeb1720
author Ethan Nicholas <ethannicholas@google.com> Wed May 15 15:29:54 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 15 20:05:45 2019 +0000
tree 2e1af05fb3b482146a6b1b0ea2b42e3a7e568785
parent fc1dddbb8d2610882589fca969c005bf3e99a645

added external value support to SkSL interpreter

Bug: skia:
Change-Id: I1806e1f6abaef322ecd3ba0d9bfaa9d7ca7a44c1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212983
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/sksl/SkSLSPIRVCodeGenerator.cpp

diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index f5736a8..08c0fdb 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -1792,12 +1792,12 @@
             Layout layout(0, -1, -1, 1, -1, -1, -1, -1, Layout::Format::kUnspecified,
                           Layout::kUnspecified_Primitive, -1, -1, "", Layout::kNo_Key,
                           Layout::CType::kDefault);
-            Variable* intfVar = new Variable(-1,
-                                             Modifiers(layout, Modifiers::kUniform_Flag),
-                                             name,
-                                             intfStruct,
-                                             Variable::kGlobal_Storage);
-            fSynthetics.takeOwnership(intfVar);
+            Variable* intfVar = (Variable*) fSynthetics.takeOwnership(std::unique_ptr<Symbol>(
+                                           new Variable(-1,
+                                                        Modifiers(layout, Modifiers::kUniform_Flag),
+                                                        name,
+                                                        intfStruct,
+                                                        Variable::kGlobal_Storage)));
             InterfaceBlock intf(-1, intfVar, name, String(""),
                                 std::vector<std::unique_ptr<Expression>>(), st);
             fRTHeightStructId = this->writeInterfaceBlock(intf);