commit af8047dbb84911362bacf0bc07fd458e313f08b4
author John Stiles <johnstiles@google.com> Tue Jun 15 17:11:20 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 15 22:51:40 2021 +0000
tree 7d88cf1c39a83ff40d17ad6dddd04c04089e68a9
parent 6ae690f8b2f575224a92b161c3718ee7bde510bd

Rename existing 'Blend' enums/names to 'BlendFilter'.

Change-Id: I17c624e9145d7152f65695ca3ce4592a11bb09a2
Bug: skia:12080
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/418637
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/sksl/SkSLCompiler.cpp

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 15fa2af..e653aad 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -298,13 +298,13 @@
     return fRuntimeShaderModule;
 }
 
-const ParsedModule& Compiler::loadRuntimeBlendModule() {
-    if (!fRuntimeBlendModule.fSymbols) {
-        fRuntimeBlendModule = this->parseModule(
-                ProgramKind::kRuntimeBlend, MODULE_DATA(rt_blend), this->loadPublicModule());
-        add_glsl_type_aliases(fRuntimeBlendModule.fSymbols.get(), fContext->fTypes);
+const ParsedModule& Compiler::loadRuntimeBlendFilterModule() {
+    if (!fRuntimeBlendFilterModule.fSymbols) {
+        fRuntimeBlendFilterModule = this->parseModule(
+                ProgramKind::kRuntimeBlendFilter, MODULE_DATA(rt_blend), this->loadPublicModule());
+        add_glsl_type_aliases(fRuntimeBlendFilterModule.fSymbols.get(), fContext->fTypes);
     }
-    return fRuntimeBlendModule;
+    return fRuntimeBlendFilterModule;
 }
 
 const ParsedModule& Compiler::moduleForProgramKind(ProgramKind kind) {
@@ -315,7 +315,7 @@
         case ProgramKind::kFragmentProcessor:  return this->loadFPModule();                 break;
         case ProgramKind::kRuntimeColorFilter: return this->loadRuntimeColorFilterModule(); break;
         case ProgramKind::kRuntimeShader:      return this->loadRuntimeShaderModule();      break;
-        case ProgramKind::kRuntimeBlend:       return this->loadRuntimeBlendModule();       break;
+        case ProgramKind::kRuntimeBlendFilter: return this->loadRuntimeBlendFilterModule(); break;
         case ProgramKind::kGeneric:            return this->loadPublicModule();             break;
     }
     SkUNREACHABLE;