Renderer components no longer need a surface reference to function.

chinmaygarde · dnfield · commit 38d4abac5193 · 2022-04-27T15:57:33.000-07:00
diff --git a/impeller/aiks/aiks_playground.cc b/impeller/aiks/aiks_playground.cc
@@ -19,8 +19,8 @@ bool AiksPlayground::OpenPlaygroundHere(const Picture& picture) {
   }
 
   return Playground::OpenPlaygroundHere(
-      [renderer, &picture](const Surface& surface, RenderPass& pass) -> bool {
-        return renderer->Render(surface, pass, picture);
+      [renderer, &picture](RenderPass& pass) -> bool {
+        return renderer->Render(pass, picture);
       });
 }
 
diff --git a/impeller/aiks/picture_renderer.cc b/impeller/aiks/picture_renderer.cc
@@ -22,16 +22,14 @@ bool PictureRenderer::IsValid() const {
   return is_valid_;
 }
 
-bool PictureRenderer::Render(const Surface& surface,
-                             RenderPass& parent_pass,
-                             const Picture& picture) {
+bool PictureRenderer::Render(RenderPass& parent_pass, const Picture& picture) {
   if (!IsValid()) {
     return false;
   }
 
   for (const auto& entry : picture.entries) {
     if (auto pass = entry.pass) {
-      if (!entity_renderer_.RenderEntities(surface, parent_pass,
+      if (!entity_renderer_.RenderEntities(parent_pass,
                                            pass->GetPassEntities())) {
         return false;
       }
diff --git a/impeller/aiks/picture_renderer.h b/impeller/aiks/picture_renderer.h
@@ -22,9 +22,7 @@ class PictureRenderer {
 
   bool IsValid() const;
 
-  [[nodiscard]] bool Render(const Surface& surface,
-                            RenderPass& parent_pass,
-                            const Picture& picture);
+  [[nodiscard]] bool Render(RenderPass& parent_pass, const Picture& picture);
 
  private:
   EntityRenderer entity_renderer_;
diff --git a/impeller/entity/contents.cc b/impeller/entity/contents.cc
@@ -56,7 +56,6 @@ const std::vector<Color>& LinearGradientContents::GetColors() const {
 
 bool LinearGradientContents::Render(const ContentRenderer& renderer,
                                     const Entity& entity,
-                                    const Surface& surface,
                                     RenderPass& pass) const {
   using VS = GradientFillPipeline::VertexShader;
   using FS = GradientFillPipeline::FragmentShader;
@@ -75,8 +74,8 @@ bool LinearGradientContents::Render(const ContentRenderer& renderer,
   }
 
   VS::FrameInfo frame_info;
-  frame_info.mvp =
-      Matrix::MakeOrthographic(surface.GetSize()) * entity.GetTransformation();
+  frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
+                   entity.GetTransformation();
 
   FS::GradientInfo gradient_info;
   gradient_info.start_point = start_point_;
@@ -134,7 +133,6 @@ static VertexBuffer CreateSolidFillVertices(const Path& path,
 
 bool SolidColorContents::Render(const ContentRenderer& renderer,
                                 const Entity& entity,
-                                const Surface& surface,
                                 RenderPass& pass) const {
   if (color_.IsTransparent()) {
     return true;
@@ -150,8 +148,8 @@ bool SolidColorContents::Render(const ContentRenderer& renderer,
       CreateSolidFillVertices(entity.GetPath(), pass.GetTransientsBuffer()));
 
   VS::FrameInfo frame_info;
-  frame_info.mvp =
-      Matrix::MakeOrthographic(surface.GetSize()) * entity.GetTransformation();
+  frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
+                   entity.GetTransformation();
   frame_info.color = color_;
   VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frame_info));
 
@@ -188,7 +186,6 @@ std::shared_ptr<Texture> TextureContents::GetTexture() const {
 
 bool TextureContents::Render(const ContentRenderer& renderer,
                              const Entity& entity,
-                             const Surface& surface,
                              RenderPass& pass) const {
   if (texture_ == nullptr) {
     return true;
@@ -234,8 +231,8 @@ bool TextureContents::Render(const ContentRenderer& renderer,
   auto& host_buffer = pass.GetTransientsBuffer();
 
   VS::FrameInfo frame_info;
-  frame_info.mvp =
-      Matrix::MakeOrthographic(surface.GetSize()) * entity.GetTransformation();
+  frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
+                   entity.GetTransformation();
 
   Command cmd;
   cmd.label = "TextureFill";
@@ -316,7 +313,6 @@ static VertexBuffer CreateSolidStrokeVertices(const Path& path,
 
 bool SolidStrokeContents::Render(const ContentRenderer& renderer,
                                  const Entity& entity,
-                                 const Surface& surface,
                                  RenderPass& pass) const {
   if (color_.IsTransparent() || stroke_size_ <= 0.0) {
     return true;
@@ -325,8 +321,8 @@ bool SolidStrokeContents::Render(const ContentRenderer& renderer,
   using VS = SolidStrokeVertexShader;
 
   VS::FrameInfo frame_info;
-  frame_info.mvp =
-      Matrix::MakeOrthographic(surface.GetSize()) * entity.GetTransformation();
+  frame_info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize()) *
+                   entity.GetTransformation();
 
   VS::StrokeInfo stroke_info;
   stroke_info.color = color_;
@@ -366,7 +362,6 @@ ClipContents::~ClipContents() = default;
 
 bool ClipContents::Render(const ContentRenderer& renderer,
                           const Entity& entity,
-                          const Surface& surface,
                           RenderPass& pass) const {
   using VS = ClipPipeline::VertexShader;
 
@@ -380,7 +375,7 @@ bool ClipContents::Render(const ContentRenderer& renderer,
   VS::FrameInfo info;
   // The color really doesn't matter.
   info.color = Color::SkyBlue();
-  info.mvp = Matrix::MakeOrthographic(surface.GetSize());
+  info.mvp = Matrix::MakeOrthographic(pass.GetRenderTargetSize());
 
   VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(info));
 
diff --git a/impeller/entity/contents.h b/impeller/entity/contents.h
@@ -28,7 +28,6 @@ class Contents {
 
   virtual bool Render(const ContentRenderer& renderer,
                       const Entity& entity,
-                      const Surface& surface,
                       RenderPass& pass) const = 0;
 
  private:
@@ -44,7 +43,6 @@ class LinearGradientContents final : public Contents {
   // |Contents|
   bool Render(const ContentRenderer& renderer,
               const Entity& entity,
-              const Surface& surface,
               RenderPass& pass) const override;
 
   void SetEndPoints(Point start_point, Point end_point);
@@ -76,7 +74,6 @@ class SolidColorContents final : public Contents {
   // |Contents|
   bool Render(const ContentRenderer& renderer,
               const Entity& entity,
-              const Surface& surface,
               RenderPass& pass) const override;
 
  private:
@@ -102,7 +99,6 @@ class TextureContents final : public Contents {
   // |Contents|
   bool Render(const ContentRenderer& renderer,
               const Entity& entity,
-              const Surface& surface,
               RenderPass& pass) const override;
 
  public:
@@ -129,7 +125,6 @@ class SolidStrokeContents final : public Contents {
   // |Contents|
   bool Render(const ContentRenderer& renderer,
               const Entity& entity,
-              const Surface& surface,
               RenderPass& pass) const override;
 
  private:
@@ -148,7 +143,6 @@ class ClipContents final : public Contents {
   // |Contents|
   bool Render(const ContentRenderer& renderer,
               const Entity& entity,
-              const Surface& surface,
               RenderPass& pass) const override;
 
  private:
diff --git a/impeller/entity/entity_playground.cc b/impeller/entity/entity_playground.cc
@@ -17,10 +17,9 @@ bool EntityPlayground::OpenPlaygroundHere(Entity entity) {
       return false;
     }
   }
-  Renderer::RenderCallback callback = [&](const Surface& surface,
-                                          RenderPass& pass) -> bool {
+  Renderer::RenderCallback callback = [&](RenderPass& pass) -> bool {
     std::vector<Entity> entities = {entity};
-    return renderer_->RenderEntities(surface, pass, entities);
+    return renderer_->RenderEntities(pass, entities);
   };
   return Playground::OpenPlaygroundHere(callback);
 }
diff --git a/impeller/entity/entity_renderer.cc b/impeller/entity/entity_renderer.cc
@@ -29,16 +29,15 @@ bool EntityRenderer::IsValid() const {
   return is_valid_;
 }
 
-bool EntityRenderer::RenderEntities(const Surface& surface,
-                                    RenderPass& parent_pass,
+bool EntityRenderer::RenderEntities(RenderPass& parent_pass,
                                     const std::vector<Entity>& entities) {
   if (!IsValid()) {
     return false;
   }
 
   for (const auto& entity : entities) {
     if (auto contents = entity.GetContents()) {
-      if (!contents->Render(*content_renderer_, entity, surface, parent_pass)) {
+      if (!contents->Render(*content_renderer_, entity, parent_pass)) {
         return false;
       }
     }
diff --git a/impeller/entity/entity_renderer.h b/impeller/entity/entity_renderer.h
@@ -23,8 +23,7 @@ class EntityRenderer {
 
   bool IsValid() const;
 
-  [[nodiscard]] bool RenderEntities(const Surface& surface,
-                                    RenderPass& parent_pass,
+  [[nodiscard]] bool RenderEntities(RenderPass& parent_pass,
                                     const std::vector<Entity>& entities);
 
  private:
diff --git a/impeller/playground/playground.mm b/impeller/playground/playground.mm
@@ -180,11 +180,10 @@ static void PlaygroundKeyCallback(GLFWwindow* window,
 
     Surface surface(desc);
 
-    Renderer::RenderCallback wrapped_callback =
-        [render_callback](const auto& surface, auto& pass) {
-          pass.SetLabel("Playground Main Render Pass");
-          return render_callback(surface, pass);
-        };
+    Renderer::RenderCallback wrapped_callback = [render_callback](auto& pass) {
+      pass.SetLabel("Playground Main Render Pass");
+      return render_callback(pass);
+    };
 
     if (!renderer_.Render(surface, wrapped_callback)) {
       FML_LOG(ERROR) << "Could not render into the surface.";
diff --git a/impeller/renderer/BUILD.gn b/impeller/renderer/BUILD.gn
@@ -72,8 +72,8 @@ impeller_component("renderer") {
               "range.h",
               "render_pass.h",
               "render_pass.cc",
-              "render_pass_descriptor.h",
-              "render_pass_descriptor.cc",
+              "render_target.h",
+              "render_target.cc",
               "renderer.h",
               "renderer.cc",
               "sampler.h",
diff --git a/impeller/renderer/backend/metal/command_buffer_mtl.h b/impeller/renderer/backend/metal/command_buffer_mtl.h
@@ -34,7 +34,7 @@ class CommandBufferMTL final : public CommandBuffer {
 
   // |CommandBuffer|
   std::shared_ptr<RenderPass> CreateRenderPass(
-      const RenderTarget& desc) const override;
+      RenderTarget target) const override;
 
   FML_DISALLOW_COPY_AND_ASSIGN(CommandBufferMTL);
 };
diff --git a/impeller/renderer/backend/metal/command_buffer_mtl.mm b/impeller/renderer/backend/metal/command_buffer_mtl.mm
@@ -53,12 +53,13 @@
 }
 
 std::shared_ptr<RenderPass> CommandBufferMTL::CreateRenderPass(
-    const RenderTarget& desc) const {
+    RenderTarget target) const {
   if (!buffer_) {
     return nullptr;
   }
 
-  auto pass = std::shared_ptr<RenderPassMTL>(new RenderPassMTL(buffer_, desc));
+  auto pass = std::shared_ptr<RenderPassMTL>(
+      new RenderPassMTL(buffer_, std::move(target)));
   if (!pass->IsValid()) {
     return nullptr;
   }
diff --git a/impeller/renderer/backend/metal/render_pass_mtl.h b/impeller/renderer/backend/metal/render_pass_mtl.h
@@ -8,7 +8,7 @@
 
 #include "flutter/fml/macros.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/render_pass_descriptor.h"
+#include "impeller/renderer/render_target.h"
 
 namespace impeller {
 
@@ -27,7 +27,7 @@ class RenderPassMTL final : public RenderPass {
   std::string label_;
   bool is_valid_ = false;
 
-  RenderPassMTL(id<MTLCommandBuffer> buffer, const RenderTarget& desc);
+  RenderPassMTL(id<MTLCommandBuffer> buffer, RenderTarget target);
 
   // |RenderPass|
   bool IsValid() const override;
diff --git a/impeller/renderer/backend/metal/render_pass_mtl.mm b/impeller/renderer/backend/metal/render_pass_mtl.mm
@@ -92,10 +92,10 @@ static bool ConfigureStencilAttachment(
   return result;
 }
 
-RenderPassMTL::RenderPassMTL(id<MTLCommandBuffer> buffer,
-                             const RenderTarget& desc)
-    : buffer_(buffer),
-      desc_(ToMTLRenderPassDescriptor(desc)),
+RenderPassMTL::RenderPassMTL(id<MTLCommandBuffer> buffer, RenderTarget target)
+    : RenderPass(std::move(target)),
+      buffer_(buffer),
+      desc_(ToMTLRenderPassDescriptor(GetRenderTarget())),
       transients_buffer_(HostBuffer::Create()) {
   if (!buffer_ || !desc_) {
     return;
diff --git a/impeller/renderer/command_buffer.h b/impeller/renderer/command_buffer.h
@@ -54,12 +54,13 @@ class CommandBuffer {
   //----------------------------------------------------------------------------
   /// @brief      Create a render pass to record render commands into.
   ///
-  /// @param[in]  desc  The description of the render pass.
+  /// @param[in]  desc  The description of the render target this pass will
+  ///                   target.
   ///
   /// @return     A valid render pass or null.
   ///
   virtual std::shared_ptr<RenderPass> CreateRenderPass(
-      const RenderTarget& desc) const = 0;
+      RenderTarget render_target) const = 0;
 
  protected:
   CommandBuffer();
diff --git a/impeller/renderer/render_pass.cc b/impeller/renderer/render_pass.cc
@@ -6,8 +6,17 @@
 
 namespace impeller {
 
-RenderPass::RenderPass() = default;
+RenderPass::RenderPass(RenderTarget target)
+    : render_target_(std::move(target)) {}
 
 RenderPass::~RenderPass() = default;
 
+const RenderTarget& RenderPass::GetRenderTarget() const {
+  return render_target_;
+}
+
+ISize RenderPass::GetRenderTargetSize() const {
+  return render_target_.GetRenderTargetSize();
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/render_pass.h b/impeller/renderer/render_pass.h
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "impeller/renderer/command.h"
+#include "impeller/renderer/render_target.h"
 
 namespace impeller {
 
@@ -20,10 +21,16 @@ class Allocator;
 ///             Render passes can be obtained from the command buffer in which
 ///             the pass is meant to encode commands into.
 ///
+/// @see        `CommandBuffer`
+///
 class RenderPass {
  public:
   virtual ~RenderPass();
 
+  const RenderTarget& GetRenderTarget() const;
+
+  ISize GetRenderTargetSize() const;
+
   virtual bool IsValid() const = 0;
 
   virtual void SetLabel(std::string label) = 0;
@@ -52,9 +59,11 @@ class RenderPass {
   virtual bool EncodeCommands(Allocator& transients_allocator) const = 0;
 
  protected:
-  RenderPass();
+  RenderPass(RenderTarget target);
 
  private:
+  const RenderTarget render_target_;
+
   FML_DISALLOW_COPY_AND_ASSIGN(RenderPass);
 };
 
diff --git a/impeller/renderer/render_target.cc b/impeller/renderer/render_target.cc
diff --git a/impeller/renderer/render_target.h b/impeller/renderer/render_target.h
diff --git a/impeller/renderer/renderer.cc b/impeller/renderer/renderer.cc
diff --git a/impeller/renderer/renderer.h b/impeller/renderer/renderer.h
diff --git a/impeller/renderer/renderer_unittests.cc b/impeller/renderer/renderer_unittests.cc
diff --git a/impeller/renderer/surface.h b/impeller/renderer/surface.h

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ bool AiksPlayground::OpenPlaygroundHere(const Picture& picture) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`return Playground::OpenPlaygroundHere(`
`22`		`- [renderer, &picture](const Surface& surface, RenderPass& pass) -> bool {`
`23`		`- return renderer->Render(surface, pass, picture);`
	`22`	`+ [renderer, &picture](RenderPass& pass) -> bool {`
	`23`	`+ return renderer->Render(pass, picture);`
`24`	`24`	`});`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -22,16 +22,14 @@ bool PictureRenderer::IsValid() const {`
`22`	`22`	`return is_valid_;`
`23`	`23`	`}`
`24`	`24`
`25`		`-bool PictureRenderer::Render(const Surface& surface,`
`26`		`- RenderPass& parent_pass,`
`27`		`- const Picture& picture) {`
	`25`	`+bool PictureRenderer::Render(RenderPass& parent_pass, const Picture& picture) {`
`28`	`26`	`if (!IsValid()) {`
`29`	`27`	`return false;`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`for (const auto& entry : picture.entries) {`
`33`	`31`	`if (auto pass = entry.pass) {`
`34`		`- if (!entity_renderer_.RenderEntities(surface, parent_pass,`
	`32`	`+ if (!entity_renderer_.RenderEntities(parent_pass,`
`35`	`33`	`pass->GetPassEntities())) {`
`36`	`34`	`return false;`
`37`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,9 @@ bool EntityPlayground::OpenPlaygroundHere(Entity entity) {`
`17`	`17`	`return false;`
`18`	`18`	`}`
`19`	`19`	`}`
`20`		`- Renderer::RenderCallback callback = [&](const Surface& surface,`
`21`		`- RenderPass& pass) -> bool {`
	`20`	`+ Renderer::RenderCallback callback = [&](RenderPass& pass) -> bool {`
`22`	`21`	`std::vector<Entity> entities = {entity};`
`23`		`- return renderer_->RenderEntities(surface, pass, entities);`
	`22`	`+ return renderer_->RenderEntities(pass, entities);`
`24`	`23`	`};`
`25`	`24`	`return Playground::OpenPlaygroundHere(callback);`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,15 @@ bool EntityRenderer::IsValid() const {`
`29`	`29`	`return is_valid_;`
`30`	`30`	`}`
`31`	`31`
`32`		`-bool EntityRenderer::RenderEntities(const Surface& surface,`
`33`		`- RenderPass& parent_pass,`
	`32`	`+bool EntityRenderer::RenderEntities(RenderPass& parent_pass,`
`34`	`33`	`const std::vector<Entity>& entities) {`
`35`	`34`	`if (!IsValid()) {`
`36`	`35`	`return false;`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`for (const auto& entity : entities) {`
`40`	`39`	`if (auto contents = entity.GetContents()) {`
`41`		`- if (!contents->Render(*content_renderer_, entity, surface, parent_pass)) {`
	`40`	`+ if (!contents->Render(*content_renderer_, entity, parent_pass)) {`
`42`	`41`	`return false;`
`43`	`42`	`}`
`44`	`43`	`}`