fixups for entity transform.

Author: jonahwilliams

impeller/entity/contents/filters/runtime_effect_filter_contents.cc

@@ -3,16 +3,33 @@
 // found in the LICENSE file.
 
 #include "impeller/entity/contents/filters/runtime_effect_filter_contents.h"
+
 #include <cstring>
+#include <optional>
+
 #include "impeller/base/validation.h"
 #include "impeller/entity/contents/anonymous_contents.h"
 #include "impeller/entity/contents/runtime_effect_contents.h"
 #include "impeller/entity/geometry/geometry.h"
-#include "impeller/geometry/point.h"
 #include "impeller/geometry/size.h"
 
 namespace impeller {
 
+void RuntimeEffectFilterContents::SetRuntimeStage(
+    std::shared_ptr<RuntimeStage> runtime_stage) {
+  runtime_stage_ = std::move(runtime_stage);
+}
+
+void RuntimeEffectFilterContents::SetUniforms(
+    std::shared_ptr<std::vector<uint8_t>> uniforms) {
+  uniforms_ = std::move(uniforms);
+}
+
+void RuntimeEffectFilterContents::SetTextureInputs(
+    std::vector<RuntimeEffectContents::TextureInput> texture_inputs) {
+  texture_inputs_ = std::move(texture_inputs);
+}
+
 // |FilterContents|
 std::optional<Entity> RuntimeEffectFilterContents::RenderFilter(
     const FilterInput::Vector& inputs,
@@ -26,10 +43,15 @@ std::optional<Entity> RuntimeEffectFilterContents::RenderFilter(
   }
 
   auto input_snapshot =
-      inputs[0]->GetSnapshot("RuntimeEffectContents", renderer, {});
+      inputs[0]->GetSnapshot("RuntimeEffectContents", renderer, entity);
   if (!input_snapshot.has_value()) {
     return std::nullopt;
   }
+  std::optional<Rect> maybe_input_coverage = input_snapshot->GetCoverage();
+  if (!maybe_input_coverage.has_value()) {
+    return std::nullopt;
+  }
+  Rect input_coverage = maybe_input_coverage.value();
   // The shader is required to have at least one sampler, the first of
   // which is treated as the input and a vec2 size uniform to compute the
   // offsets. These are validated at the dart:ui layer, but to avoid crashes we
@@ -40,24 +62,29 @@ std::optional<Entity> RuntimeEffectFilterContents::RenderFilter(
         << "Shader must have at least one sampler and a vec2 size uniform.";
     return std::nullopt;
   }
-  texture_inputs_[0].texture = input_snapshot->texture;
+
+  // Update uniform values.
+  std::vector<RuntimeEffectContents::TextureInput> texture_input_copy =
+      texture_inputs_;
+  texture_input_copy[0].texture = input_snapshot->texture;
+
   Size size = Size(input_snapshot->texture->GetSize());
   memcpy(uniforms_->data(), &size, sizeof(Size));
 
   //----------------------------------------------------------------------------
   /// Create AnonymousContents for rendering.
   ///
-  RenderProc render_proc = [input_snapshot, runtime_stage = runtime_stage_,
-                            uniforms = uniforms_,
-                            texture_inputs = texture_inputs_](
-                               const ContentContext& renderer,
-                               const Entity& entity, RenderPass& pass) -> bool {
+  RenderProc render_proc =
+      [input_snapshot, runtime_stage = runtime_stage_, uniforms = uniforms_,
+       texture_inputs = texture_input_copy,
+       input_coverage](const ContentContext& renderer, const Entity& entity,
+                       RenderPass& pass) -> bool {
     RuntimeEffectContents contents;
     contents.SetRuntimeStage(runtime_stage);
     contents.SetUniformData(uniforms);
     contents.SetTextureInputs(texture_inputs);
     contents.SetGeometry(
-        Geometry::MakeRect(input_snapshot->GetCoverage().value()));
+        Geometry::MakeRect(Rect::MakeSize(input_coverage.GetSize())));
     return contents.Render(renderer, entity, pass);
   };
 
@@ -71,7 +98,7 @@ std::optional<Entity> RuntimeEffectFilterContents::RenderFilter(
   Entity sub_entity;
   sub_entity.SetContents(std::move(contents));
   sub_entity.SetBlendMode(entity.GetBlendMode());
-  sub_entity.SetTransform(entity.GetTransform());
+  sub_entity.SetTransform(input_snapshot->transform);
   return sub_entity;
 }
 

impeller/entity/contents/filters/runtime_effect_filter_contents.h

@@ -9,29 +9,24 @@
 
 namespace impeller {
 
+/// A filter that applies a runtime effect shader
 class RuntimeEffectFilterContents final : public FilterContents {
  public:
   RuntimeEffectFilterContents() {}
 
-  ~RuntimeEffectFilterContents() {}
+  ~RuntimeEffectFilterContents() = default;
 
-  void SetRuntimeStage(std::shared_ptr<RuntimeStage> runtime_stage) {
-    runtime_stage_ = std::move(runtime_stage);
-  }
+  void SetRuntimeStage(std::shared_ptr<RuntimeStage> runtime_stage);
 
-  void SetUniforms(std::shared_ptr<std::vector<uint8_t>> uniforms) {
-    uniforms_ = std::move(uniforms);
-  }
+  void SetUniforms(std::shared_ptr<std::vector<uint8_t>> uniforms);
 
   void SetTextureInputs(
-      std::vector<RuntimeEffectContents::TextureInput> texture_inputs) {
-    texture_inputs_ = std::move(texture_inputs);
-  }
+      std::vector<RuntimeEffectContents::TextureInput> texture_inputs);
 
  private:
   std::shared_ptr<RuntimeStage> runtime_stage_;
-  mutable std::shared_ptr<std::vector<uint8_t>> uniforms_;
-  mutable std::vector<RuntimeEffectContents::TextureInput> texture_inputs_;
+  std::shared_ptr<std::vector<uint8_t>> uniforms_;
+  std::vector<RuntimeEffectContents::TextureInput> texture_inputs_;
 
   // |FilterContents|
   std::optional<Entity> RenderFilter(