Separate FilterInput variants into their own TUs (flutter#152)

egramond · Apr 27, 2022 · da9cfb3 · da9cfb3
1 parent 5ec32d7
commit da9cfb3
Show file tree

Hide file tree

Showing 18 changed files with 352 additions and 324 deletions.
diff --git a/impeller/entity/BUILD.gn b/impeller/entity/BUILD.gn
@@ -39,14 +39,20 @@ impeller_component("entity") {
     "contents/contents.h",
     "contents/filters/blend_filter_contents.cc",
     "contents/filters/blend_filter_contents.h",
+    "contents/filters/border_mask_blur_filter_contents.cc",
+    "contents/filters/border_mask_blur_filter_contents.h",
     "contents/filters/filter_contents.cc",
     "contents/filters/filter_contents.h",
-    "contents/filters/filter_input.cc",
-    "contents/filters/filter_input.h",
     "contents/filters/gaussian_blur_filter_contents.cc",
     "contents/filters/gaussian_blur_filter_contents.h",
-    "contents/filters/border_mask_blur_filter_contents.cc",
-    "contents/filters/border_mask_blur_filter_contents.h",
+    "contents/filters/inputs/contents_filter_input.cc",
+    "contents/filters/inputs/contents_filter_input.h",
+    "contents/filters/inputs/filter_contents_filter_input.cc",
+    "contents/filters/inputs/filter_contents_filter_input.h",
+    "contents/filters/inputs/filter_input.cc",
+    "contents/filters/inputs/filter_input.h",
+    "contents/filters/inputs/texture_filter_input.cc",
+    "contents/filters/inputs/texture_filter_input.h",
     "contents/linear_gradient_contents.cc",
     "contents/linear_gradient_contents.h",
     "contents/snapshot.cc",

diff --git a/impeller/entity/contents/filters/blend_filter_contents.cc b/impeller/entity/contents/filters/blend_filter_contents.cc
@@ -5,7 +5,7 @@
 #include "impeller/entity/contents/filters/blend_filter_contents.h"
 
 #include "impeller/entity/contents/content_context.h"
-#include "impeller/entity/contents/filters/filter_input.h"
+#include "impeller/entity/contents/filters/inputs/filter_input.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/sampler_library.h"
 

diff --git a/impeller/entity/contents/filters/blend_filter_contents.h b/impeller/entity/contents/filters/blend_filter_contents.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "impeller/entity/contents/filters/filter_contents.h"
-#include "impeller/entity/contents/filters/filter_input.h"
+#include "impeller/entity/contents/filters/inputs/filter_input.h"
 
 namespace impeller {
 

diff --git a/impeller/entity/contents/filters/border_mask_blur_filter_contents.h b/impeller/entity/contents/filters/border_mask_blur_filter_contents.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <optional>
 #include "impeller/entity/contents/filters/filter_contents.h"
-#include "impeller/entity/contents/filters/filter_input.h"
+#include "impeller/entity/contents/filters/inputs/filter_input.h"
 
 namespace impeller {
 

diff --git a/impeller/entity/contents/filters/filter_contents.cc b/impeller/entity/contents/filters/filter_contents.cc
@@ -16,7 +16,7 @@
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/filters/blend_filter_contents.h"
 #include "impeller/entity/contents/filters/border_mask_blur_filter_contents.h"
-#include "impeller/entity/contents/filters/filter_input.h"
+#include "impeller/entity/contents/filters/inputs/filter_input.h"
 #include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"
 #include "impeller/entity/contents/texture_contents.h"
 #include "impeller/entity/entity.h"

diff --git a/impeller/entity/contents/filters/filter_contents.h b/impeller/entity/contents/filters/filter_contents.h
@@ -8,7 +8,7 @@
 #include <variant>
 #include <vector>
 
-#include "impeller/entity/contents/filters/filter_input.h"
+#include "impeller/entity/contents/filters/inputs/filter_input.h"
 #include "impeller/entity/entity.h"
 #include "impeller/renderer/formats.h"
 
@@ -145,8 +145,6 @@ class FilterContents : public Contents {
   FilterInput::Vector inputs_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(FilterContents);
-
-  friend FilterContentsFilterInput;
 };
 
 }  // namespace impeller
diff --git a/impeller/entity/contents/filters/filter_input.cc b/impeller/entity/contents/filters/filter_input.cc
diff --git a/impeller/entity/contents/filters/filter_input.h b/impeller/entity/contents/filters/filter_input.h