flutter · auto-submit · Jan 24, 2024 · Jan 23, 2024 · Jan 23, 2024 · Jan 23, 2024
diff --git a/impeller/compiler/reflector.cc b/impeller/compiler/reflector.cc
@@ -1364,7 +1364,7 @@ std::vector<Reflector::BindPrototype> Reflector::ReflectBindPrototypes(
         .argument_name = "texture",
     });
     proto.args.push_back(BindPrototypeArgument{
-        .type_name = "std::shared_ptr<const Sampler>",
+        .type_name = "const std::unique_ptr<const Sampler>&",
         .argument_name = "sampler",
     });
   }

diff --git a/impeller/core/resource_binder.h b/impeller/core/resource_binder.h
@@ -34,7 +34,7 @@ struct ResourceBinder {
                             const SampledImageSlot& slot,
                             const ShaderMetadata& metadata,
                             std::shared_ptr<const Texture> texture,
-                            std::shared_ptr<const Sampler> sampler) = 0;
+                            const std::unique_ptr<const Sampler>& sampler) = 0;
 };
 
 }  // namespace impeller

diff --git a/impeller/core/sampler.h b/impeller/core/sampler.h
@@ -16,8 +16,6 @@ class Sampler {
  public:
   virtual ~Sampler();
 
-  virtual bool IsValid() const = 0;
-
   const SamplerDescriptor& GetDescriptor() const;
 
  protected:
@@ -32,7 +30,7 @@ class Sampler {
 };
 
 using SamplerMap = std::unordered_map<SamplerDescriptor,
-                                      std::shared_ptr<const Sampler>,
+                                      std::unique_ptr<const Sampler>,
                                       ComparableHash<SamplerDescriptor>,
                                       ComparableEqual<SamplerDescriptor>>;
 

diff --git a/impeller/entity/contents/atlas_contents.cc b/impeller/entity/contents/atlas_contents.cc
@@ -252,8 +252,9 @@ bool AtlasContents::Render(const ContentContext& renderer,
       dst_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
       dst_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
     }
-    auto dst_sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-        dst_sampler_descriptor);
+    const std::unique_ptr<const Sampler>& dst_sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+            dst_sampler_descriptor);
     FS::BindTextureSamplerDst(pass, texture_, dst_sampler);
     frame_info.texture_sampler_y_coord_scale = texture_->GetYCoordScale();
 

diff --git a/impeller/entity/contents/filters/blend_filter_contents.cc b/impeller/entity/contents/filters/blend_filter_contents.cc
@@ -179,8 +179,9 @@ static std::optional<Entity> AdvancedBlend(
       dst_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
       dst_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
     }
-    auto dst_sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-        dst_sampler_descriptor);
+    const std::unique_ptr<const Sampler>& dst_sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+            dst_sampler_descriptor);
     FS::BindTextureSamplerDst(pass, dst_snapshot->texture, dst_sampler);
     frame_info.dst_y_coord_scale = dst_snapshot->texture->GetYCoordScale();
     blend_info.dst_input_alpha =
@@ -201,8 +202,9 @@ static std::optional<Entity> AdvancedBlend(
         src_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
         src_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
       }
-      auto src_sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-          src_sampler_descriptor);
+      const std::unique_ptr<const Sampler>& src_sampler =
+          renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+              src_sampler_descriptor);
       blend_info.color_factor = 0;
       blend_info.src_input_alpha = src_snapshot->opacity;
       FS::BindTextureSamplerSrc(pass, src_snapshot->texture, src_sampler);
@@ -351,8 +353,9 @@ std::optional<Entity> BlendFilterContents::CreateForegroundAdvancedBlend(
       dst_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
       dst_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
     }
-    auto dst_sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-        dst_sampler_descriptor);
+    const std::unique_ptr<const Sampler>& dst_sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+            dst_sampler_descriptor);
     FS::BindTextureSamplerDst(pass, dst_snapshot->texture, dst_sampler);
     frame_info.dst_y_coord_scale = dst_snapshot->texture->GetYCoordScale();
     blend_info.dst_input_alpha =
@@ -473,8 +476,9 @@ std::optional<Entity> BlendFilterContents::CreateForegroundPorterDuffBlend(
       dst_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
       dst_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
     }
-    auto dst_sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-        dst_sampler_descriptor);
+    const std::unique_ptr<const Sampler>& dst_sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+            dst_sampler_descriptor);
     FS::BindTextureSamplerDst(pass, dst_snapshot->texture, dst_sampler);
     frame_info.texture_sampler_y_coord_scale =
         dst_snapshot->texture->GetYCoordScale();
@@ -570,8 +574,9 @@ static std::optional<Entity> PipelineBlend(
         return false;
       }
 
-      auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-          input->sampler_descriptor);
+      const std::unique_ptr<const Sampler>& sampler =
+          renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+              input->sampler_descriptor);
       FS::BindTextureSamplerSrc(pass, input->texture, sampler);
 
       auto size = input->texture->GetSize();

diff --git a/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc b/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
@@ -123,7 +123,8 @@ std::optional<Entity> BorderMaskBlurFilterContents::RenderFilter(
     FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
     VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));
 
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
+    const std::unique_ptr<const Sampler>& sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
     FS::BindTextureSampler(pass, input_snapshot->texture, sampler);
 
     return pass.Draw().ok();

diff --git a/impeller/entity/contents/filters/color_matrix_filter_contents.cc b/impeller/entity/contents/filters/color_matrix_filter_contents.cc
@@ -96,7 +96,8 @@ std::optional<Entity> ColorMatrixFilterContents::RenderFilter(
         absorb_opacity == ColorFilterContents::AbsorbOpacity::kYes
             ? input_snapshot->opacity
             : 1.0f;
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
+    const std::unique_ptr<const Sampler>& sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
     FS::BindInputTexture(pass, input_snapshot->texture, sampler);
     FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
 

diff --git a/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc b/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
@@ -77,7 +77,8 @@ std::optional<Entity> SrgbToLinearFilterContents::RenderFilter(
             ? input_snapshot->opacity
             : 1.0f;
 
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
+    const std::unique_ptr<const Sampler>& sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
     FS::BindInputTexture(pass, input_snapshot->texture, sampler);
     FS::BindFragInfo(pass, host_buffer.EmplaceUniform(frag_info));
     VS::BindFrameInfo(pass, host_buffer.EmplaceUniform(frame_info));

diff --git a/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc b/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
@@ -111,7 +111,8 @@ std::optional<Entity> YUVToRGBFilterContents::RenderFilter(
         break;
     }
 
-    auto sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
+    const std::unique_ptr<const Sampler>& sampler =
+        renderer.GetContext()->GetSamplerLibrary()->GetSampler({});
     FS::BindYTexture(pass, y_input_snapshot->texture, sampler);
     FS::BindUvTexture(pass, uv_input_snapshot->texture, sampler);
 

diff --git a/impeller/entity/contents/framebuffer_blend_contents.cc b/impeller/entity/contents/framebuffer_blend_contents.cc
@@ -132,8 +132,9 @@ bool FramebufferBlendContents::Render(const ContentContext& renderer,
     src_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
     src_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
   }
-  auto src_sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler(
-      src_sampler_descriptor);
+  const std::unique_ptr<const Sampler>& src_sampler =
+      renderer.GetContext()->GetSamplerLibrary()->GetSampler(
+          src_sampler_descriptor);
   FS::BindTextureSamplerSrc(pass, src_snapshot->texture, src_sampler);
 
   frame_info.mvp = pass.GetOrthographicTransform() * src_snapshot->transform;

diff --git a/impeller/entity/contents/runtime_effect_contents.cc b/impeller/entity/contents/runtime_effect_contents.cc
@@ -254,7 +254,7 @@ bool RuntimeEffectContents::Render(const ContentContext& renderer,
         FML_DCHECK(sampler_index < texture_inputs_.size());
         auto& input = texture_inputs_[sampler_index];
 
-        auto sampler =
+        const std::unique_ptr<const Sampler>& sampler =
             context->GetSamplerLibrary()->GetSampler(input.sampler_descriptor);
 
         SampledImageSlot image_slot;

diff --git a/impeller/entity/contents/test/recording_render_pass.cc b/impeller/entity/contents/test/recording_render_pass.cc
@@ -103,12 +103,13 @@ bool RecordingRenderPass::BindResource(
 }
 
 // |RenderPass|
-bool RecordingRenderPass::BindResource(ShaderStage stage,
-                                       DescriptorType type,
-                                       const SampledImageSlot& slot,
-                                       const ShaderMetadata& metadata,
-                                       std::shared_ptr<const Texture> texture,
-                                       std::shared_ptr<const Sampler> sampler) {
+bool RecordingRenderPass::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const SampledImageSlot& slot,
+    const ShaderMetadata& metadata,
+    std::shared_ptr<const Texture> texture,
+    const std::unique_ptr<const Sampler>& sampler) {
   pending_.BindResource(stage, type, slot, metadata, texture, sampler);
   return delegate_->BindResource(stage, type, slot, metadata, texture, sampler);
 }

diff --git a/impeller/entity/contents/test/recording_render_pass.h b/impeller/entity/contents/test/recording_render_pass.h
@@ -66,7 +66,7 @@ class RecordingRenderPass : public RenderPass {
                     const SampledImageSlot& slot,
                     const ShaderMetadata& metadata,
                     std::shared_ptr<const Texture> texture,
-                    std::shared_ptr<const Sampler> sampler) override;
+                    const std::unique_ptr<const Sampler>& sampler) override;
 
   // |RenderPass|
   void OnSetLabel(std::string label) override;

diff --git a/impeller/playground/imgui/imgui_impl_impeller.cc b/impeller/playground/imgui/imgui_impl_impeller.cc
@@ -36,10 +36,14 @@
 #include "impeller/renderer/render_pass.h"
 
 struct ImGui_ImplImpeller_Data {
+  explicit ImGui_ImplImpeller_Data(
+      const std::unique_ptr<const impeller::Sampler>& p_sampler)
+      : sampler(p_sampler) {}
+
   std::shared_ptr<impeller::Context> context;
   std::shared_ptr<impeller::Texture> font_texture;
   std::shared_ptr<impeller::Pipeline<impeller::PipelineDescriptor>> pipeline;
-  std::shared_ptr<const impeller::Sampler> sampler;
+  const std::unique_ptr<const impeller::Sampler>& sampler;
 };
 
 static ImGui_ImplImpeller_Data* ImGui_ImplImpeller_GetBackendData() {
@@ -56,7 +60,8 @@ bool ImGui_ImplImpeller_Init(
             "Already initialized a renderer backend!");
 
   // Setup backend capabilities flags
-  auto* bd = new ImGui_ImplImpeller_Data();
+  auto* bd =
+      new ImGui_ImplImpeller_Data(context->GetSamplerLibrary()->GetSampler({}));
   io.BackendRendererUserData = reinterpret_cast<void*>(bd);
   io.BackendRendererName = "imgui_impl_impeller";
   io.BackendFlags |=
@@ -105,8 +110,6 @@ bool ImGui_ImplImpeller_Init(
     bd->pipeline =
         context->GetPipelineLibrary()->GetPipeline(std::move(desc)).Get();
     IM_ASSERT(bd->pipeline != nullptr && "Could not create ImGui pipeline.");
-
-    bd->sampler = context->GetSamplerLibrary()->GetSampler({});
     IM_ASSERT(bd->pipeline != nullptr && "Could not create ImGui sampler.");
   }
 

diff --git a/impeller/renderer/backend/gles/sampler_gles.cc b/impeller/renderer/backend/gles/sampler_gles.cc
@@ -4,8 +4,6 @@
 
 #include "impeller/renderer/backend/gles/sampler_gles.h"
 
-#include <iostream>
-
 #include "impeller/base/validation.h"
 #include "impeller/core/formats.h"
 #include "impeller/renderer/backend/gles/formats_gles.h"
@@ -18,10 +16,6 @@ SamplerGLES::SamplerGLES(SamplerDescriptor desc) : Sampler(std::move(desc)) {}
 
 SamplerGLES::~SamplerGLES() = default;
 
-bool SamplerGLES::IsValid() const {
-  return true;
-}
-
 static GLint ToParam(MinMagFilter minmag_filter,
                      std::optional<MipFilter> mip_filter = std::nullopt) {
   if (!mip_filter.has_value()) {
@@ -74,10 +68,6 @@ static GLint ToAddressMode(SamplerAddressMode mode,
 
 bool SamplerGLES::ConfigureBoundTexture(const TextureGLES& texture,
                                         const ProcTableGLES& gl) const {
-  if (!IsValid()) {
-    return false;
-  }
-
   if (texture.NeedsMipmapGeneration()) {
     VALIDATION_LOG
         << "Texture mip count is > 1, but the mipmap has not been generated. "

diff --git a/impeller/renderer/backend/gles/sampler_gles.h b/impeller/renderer/backend/gles/sampler_gles.h
@@ -28,9 +28,6 @@ class SamplerGLES final : public Sampler,
 
   explicit SamplerGLES(SamplerDescriptor desc);
 
-  // |Sampler|
-  bool IsValid() const override;
-
   SamplerGLES(const SamplerGLES&) = delete;
 
   SamplerGLES& operator=(const SamplerGLES&) = delete;

diff --git a/impeller/renderer/backend/gles/sampler_library_gles.cc b/impeller/renderer/backend/gles/sampler_library_gles.cc
@@ -11,6 +11,8 @@
 
 namespace impeller {
 
+static const std::unique_ptr<const Sampler> kNullSampler = nullptr;
+
 SamplerLibraryGLES::SamplerLibraryGLES(bool supports_decal_sampler_address_mode)
     : supports_decal_sampler_address_mode_(
           supports_decal_sampler_address_mode) {}
@@ -19,23 +21,23 @@ SamplerLibraryGLES::SamplerLibraryGLES(bool supports_decal_sampler_address_mode)
 SamplerLibraryGLES::~SamplerLibraryGLES() = default;
 
 // |SamplerLibrary|
-std::shared_ptr<const Sampler> SamplerLibraryGLES::GetSampler(
+const std::unique_ptr<const Sampler>& SamplerLibraryGLES::GetSampler(
     SamplerDescriptor descriptor) {
   if (!supports_decal_sampler_address_mode_ &&
       (descriptor.width_address_mode == SamplerAddressMode::kDecal ||
        descriptor.height_address_mode == SamplerAddressMode::kDecal ||
        descriptor.depth_address_mode == SamplerAddressMode::kDecal)) {
     VALIDATION_LOG << "SamplerAddressMode::kDecal is not supported by the "
                       "current OpenGLES backend.";
-    return nullptr;
+    return kNullSampler;
   }
 
   auto found = samplers_.find(descriptor);
   if (found != samplers_.end()) {
     return found->second;
   }
-  return samplers_[descriptor] =
-             std::shared_ptr<SamplerGLES>(new SamplerGLES(descriptor));
+  return (samplers_[descriptor] =
+              std::unique_ptr<SamplerGLES>(new SamplerGLES(descriptor)));
 }
 
 }  // namespace impeller
diff --git a/impeller/renderer/backend/gles/sampler_library_gles.h b/impeller/renderer/backend/gles/sampler_library_gles.h
@@ -5,6 +5,7 @@
 #ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_LIBRARY_GLES_H_
 #define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_LIBRARY_GLES_H_
 
+#include "impeller/core/sampler.h"
 #include "impeller/core/sampler_descriptor.h"
 #include "impeller/renderer/sampler_library.h"
 
@@ -24,7 +25,7 @@ class SamplerLibraryGLES final : public SamplerLibrary {
   SamplerLibraryGLES();
 
   // |SamplerLibrary|
-  std::shared_ptr<const Sampler> GetSampler(
+  const std::unique_ptr<const Sampler>& GetSampler(
       SamplerDescriptor descriptor) override;
 
   bool supports_decal_sampler_address_mode_ = false;

diff --git a/impeller/renderer/backend/metal/compute_pass_mtl.h b/impeller/renderer/backend/metal/compute_pass_mtl.h
@@ -61,7 +61,7 @@ class ComputePassMTL final : public ComputePass {
                     const SampledImageSlot& slot,
                     const ShaderMetadata& metadata,
                     std::shared_ptr<const Texture> texture,
-                    std::shared_ptr<const Sampler> sampler) override;
+                    const std::unique_ptr<const Sampler>& sampler) override;
 
   // |ComputePass|
   bool EncodeCommands() const override;

diff --git a/impeller/renderer/backend/metal/compute_pass_mtl.mm b/impeller/renderer/backend/metal/compute_pass_mtl.mm
@@ -93,13 +93,14 @@
 }
 
 // |ComputePass|
-bool ComputePassMTL::BindResource(ShaderStage stage,
-                                  DescriptorType type,
-                                  const SampledImageSlot& slot,
-                                  const ShaderMetadata& metadata,
-                                  std::shared_ptr<const Texture> texture,
-                                  std::shared_ptr<const Sampler> sampler) {
-  if (!sampler->IsValid() || !texture->IsValid()) {
+bool ComputePassMTL::BindResource(
+    ShaderStage stage,
+    DescriptorType type,
+    const SampledImageSlot& slot,
+    const ShaderMetadata& metadata,
+    std::shared_ptr<const Texture> texture,
+    const std::unique_ptr<const Sampler>& sampler) {
+  if (!sampler || !texture->IsValid()) {
     return false;
   }
 

diff --git a/impeller/renderer/backend/metal/render_pass_mtl.h b/impeller/renderer/backend/metal/render_pass_mtl.h
@@ -109,7 +109,7 @@ class RenderPassMTL final : public RenderPass {
                     const SampledImageSlot& slot,
                     const ShaderMetadata& metadata,
                     std::shared_ptr<const Texture> texture,
-                    std::shared_ptr<const Sampler> sampler) override;
+                    const std::unique_ptr<const Sampler>& sampler) override;
 
   RenderPassMTL(const RenderPassMTL&) = delete;