commit 9d11cbdef8547d33fa4d1dd8bd4a623df9475ecc
author Brian Osman <brianosman@google.com> Mon Apr 19 16:33:42 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 19 21:55:25 2021 +0000
tree d80e13508daa3a92bfa04c3dde68df1ed2eab297
parent 8ced56f05f2cb947551d9c70f6a43c1eff32686f

Fix soft merge conflict in SkRuntimeEffect

This meant that the new Shader/ColorFilter factories were always
compiling against the more lenient (old) rules.

Bug: skia:11813
Change-Id: I65038595edf2c6087aad6efcd27508338b24cce8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398229
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/core/SkRuntimeEffect.cpp

diff --git a/src/core/SkRuntimeEffect.cpp b/src/core/SkRuntimeEffect.cpp
index fc00e10..32d0411 100644
--- a/src/core/SkRuntimeEffect.cpp
+++ b/src/core/SkRuntimeEffect.cpp
@@ -134,12 +134,7 @@
         settings.fInlineThreshold = 0;
         settings.fForceNoInline = options.forceNoInline;
         settings.fAllowNarrowingConversions = true;
-        program = compiler->convertProgram(SkSL::ProgramKind::kRuntimeEffect,
-                                           SkSL::String(sksl.c_str(), sksl.size()),
-                                           settings);
-        // TODO: Many errors aren't caught until we process the generated Program here. Catching those
-        // in the IR generator would provide better errors messages (with locations).
-        #define RETURN_FAILURE(...) return Result{nullptr, SkStringPrintf(__VA_ARGS__)}
+        program = compiler->convertProgram(kind, SkSL::String(sksl.c_str(), sksl.size()), settings);
 
         if (!program) {
             RETURN_FAILURE("%s", compiler->errorText().c_str());