commit a8b897bfc13df75b3a0bff4266ba78a7e261f522
author Brian Osman <brianosman@google.com> Mon Aug 30 16:40:44 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Aug 31 17:35:19 2021 +0000
tree c5266aadf62797d659c853f914242667a36159e1
parent 0d45655e4219c664a96fba0ac424706137283af1

Remove blend and colorFilter sksl modules

This moves the functions for dealing with child effects into the public
module (where those types already live). With that change, blend and
colorFilter have no module-specific declarations.

Change-Id: I7665e68427ea4d8d1ed4d31afb658edb79bac5a4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/443412
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

src/sksl/SkSLCompiler.cpp

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 602f755..ba73b7a 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -61,8 +61,6 @@
 #include "src/sksl/generated/sksl_frag.dehydrated.sksl"
 #include "src/sksl/generated/sksl_gpu.dehydrated.sksl"
 #include "src/sksl/generated/sksl_public.dehydrated.sksl"
-#include "src/sksl/generated/sksl_rt_blend.dehydrated.sksl"
-#include "src/sksl/generated/sksl_rt_colorfilter.dehydrated.sksl"
 #include "src/sksl/generated/sksl_rt_shader.dehydrated.sksl"
 #include "src/sksl/generated/sksl_vert.dehydrated.sksl"
 
@@ -241,13 +239,6 @@
     return fVertexModule;
 }
 
-const ParsedModule& Compiler::loadPublicModule() {
-    if (!fPublicModule.fSymbols) {
-        fPublicModule = this->parseModule(ProgramKind::kGeneric, MODULE_DATA(public), fRootModule);
-    }
-    return fPublicModule;
-}
-
 static void add_glsl_type_aliases(SkSL::SymbolTable* symbols, const SkSL::BuiltinTypes& types) {
     // Add some aliases to the runtime effect modules so that it's friendlier, and more like GLSL
     symbols->addAlias("vec2", types.fFloat2.get());
@@ -267,42 +258,30 @@
     symbols->addAlias("mat4", types.fFloat4x4.get());
 }
 
-const ParsedModule& Compiler::loadRuntimeColorFilterModule() {
-    if (!fRuntimeColorFilterModule.fSymbols) {
-        fRuntimeColorFilterModule = this->parseModule(ProgramKind::kRuntimeColorFilter,
-                                                      MODULE_DATA(rt_colorfilter),
-                                                      this->loadPublicModule());
-        add_glsl_type_aliases(fRuntimeColorFilterModule.fSymbols.get(), fContext->fTypes);
+const ParsedModule& Compiler::loadPublicModule() {
+    if (!fPublicModule.fSymbols) {
+        fPublicModule = this->parseModule(ProgramKind::kGeneric, MODULE_DATA(public), fRootModule);
+        add_glsl_type_aliases(fPublicModule.fSymbols.get(), fContext->fTypes);
     }
-    return fRuntimeColorFilterModule;
+    return fPublicModule;
 }
 
 const ParsedModule& Compiler::loadRuntimeShaderModule() {
     if (!fRuntimeShaderModule.fSymbols) {
         fRuntimeShaderModule = this->parseModule(
                 ProgramKind::kRuntimeShader, MODULE_DATA(rt_shader), this->loadPublicModule());
-        add_glsl_type_aliases(fRuntimeShaderModule.fSymbols.get(), fContext->fTypes);
     }
     return fRuntimeShaderModule;
 }
 
-const ParsedModule& Compiler::loadRuntimeBlenderModule() {
-    if (!fRuntimeBlenderModule.fSymbols) {
-        fRuntimeBlenderModule = this->parseModule(
-                ProgramKind::kRuntimeBlender, MODULE_DATA(rt_blend), this->loadPublicModule());
-        add_glsl_type_aliases(fRuntimeBlenderModule.fSymbols.get(), fContext->fTypes);
-    }
-    return fRuntimeBlenderModule;
-}
-
 const ParsedModule& Compiler::moduleForProgramKind(ProgramKind kind) {
     switch (kind) {
-        case ProgramKind::kVertex:             return this->loadVertexModule();             break;
-        case ProgramKind::kFragment:           return this->loadFragmentModule();           break;
-        case ProgramKind::kRuntimeColorFilter: return this->loadRuntimeColorFilterModule(); break;
-        case ProgramKind::kRuntimeShader:      return this->loadRuntimeShaderModule();      break;
-        case ProgramKind::kRuntimeBlender:     return this->loadRuntimeBlenderModule();     break;
-        case ProgramKind::kGeneric:            return this->loadPublicModule();             break;
+        case ProgramKind::kVertex:             return this->loadVertexModule();        break;
+        case ProgramKind::kFragment:           return this->loadFragmentModule();      break;
+        case ProgramKind::kRuntimeColorFilter: return this->loadPublicModule();        break;
+        case ProgramKind::kRuntimeShader:      return this->loadRuntimeShaderModule(); break;
+        case ProgramKind::kRuntimeBlender:     return this->loadPublicModule();        break;
+        case ProgramKind::kGeneric:            return this->loadPublicModule();        break;
     }
     SkUNREACHABLE;
 }