Revert "[Impeller] mark decoded images as optimized for GPU access (#40356)" (#40387)

Revert "[Impeller] mark decoded images as optimized for GPU access"

Author: Jonah Williams

impeller/renderer/backend/gles/blit_pass_gles.cc

@@ -130,11 +130,6 @@ bool BlitPassGLES::OnCopyTextureToBufferCommand(
   return true;
 }
 
-bool BlitPassGLES::OnOptimizeForGPUAccess(std::shared_ptr<Texture> texture,
-                                          std::string label) {
-  return true;
-}
-
 // |BlitPass|
 bool BlitPassGLES::OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                            std::string label) {

impeller/renderer/backend/gles/blit_pass_gles.h

@@ -50,10 +50,6 @@ class BlitPassGLES final : public BlitPass {
                                     size_t destination_offset,
                                     std::string label) override;
 
-  // |BlitPass|
-  bool OnOptimizeForGPUAccess(std::shared_ptr<Texture> texture,
-                              std::string label) override;
-
   // |BlitPass|
   bool OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                std::string label) override;

impeller/renderer/backend/metal/blit_command_mtl.h

@@ -50,13 +50,4 @@ struct BlitGenerateMipmapCommandMTL : public BlitGenerateMipmapCommand,
   [[nodiscard]] bool Encode(id<MTLBlitCommandEncoder> encoder) const override;
 };
 
-struct BlitOptimizeGPUAccessCommandMTL : public BlitGenerateMipmapCommand,
-                                         public BlitEncodeMTL {
-  ~BlitOptimizeGPUAccessCommandMTL() override;
-
-  std::string GetLabel() const override;
-
-  [[nodiscard]] bool Encode(id<MTLBlitCommandEncoder> encoder) const override;
-};
-
 }  // namespace impeller

impeller/renderer/backend/metal/blit_command_mtl.mm

@@ -112,23 +112,4 @@
   return true;
 };
 
-BlitOptimizeGPUAccessCommandMTL::~BlitOptimizeGPUAccessCommandMTL() = default;
-
-std::string BlitOptimizeGPUAccessCommandMTL::GetLabel() const {
-  return label;
-}
-
-bool BlitOptimizeGPUAccessCommandMTL::Encode(
-    id<MTLBlitCommandEncoder> encoder) const {
-  if (@available(macOS 10.14, iOS 12, tvOS 12, *)) {
-    auto texture_mtl = TextureMTL::Cast(*texture).GetMTLTexture();
-    if (!texture_mtl) {
-      return false;
-    }
-
-    [encoder optimizeContentsForGPUAccess:texture_mtl];
-  }
-  return true;
-}
-
 }  // namespace impeller

impeller/renderer/backend/metal/blit_pass_mtl.h

@@ -57,10 +57,6 @@ class BlitPassMTL final : public BlitPass {
   bool OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                std::string label) override;
 
-  // |BlitPass|
-  bool OnOptimizeForGPUAccess(std::shared_ptr<Texture> texture,
-                              std::string label) override;
-
   FML_DISALLOW_COPY_AND_ASSIGN(BlitPassMTL);
 };
 

impeller/renderer/backend/metal/blit_pass_mtl.mm

@@ -134,15 +134,4 @@
   return true;
 }
 
-// |BlitPass|
-bool BlitPassMTL::OnOptimizeForGPUAccess(std::shared_ptr<Texture> texture,
-                                         std::string label) {
-  auto command = std::make_unique<BlitOptimizeGPUAccessCommandMTL>();
-  command->label = label;
-  command->texture = std::move(texture);
-
-  commands_.emplace_back(std::move(command));
-  return true;
-}
-
 }  // namespace impeller

impeller/renderer/backend/vulkan/blit_pass_vk.cc

@@ -87,12 +87,6 @@ bool BlitPassVK::OnCopyTextureToBufferCommand(
   return true;
 }
 
-// |BlitPass|
-bool BlitPassVK::OnOptimizeForGPUAccess(std::shared_ptr<Texture> texture,
-                                        std::string label) {
-  return true;
-}
-
 // |BlitPass|
 bool BlitPassVK::OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                          std::string label) {

impeller/renderer/backend/vulkan/blit_pass_vk.h

@@ -51,9 +51,6 @@ class BlitPassVK final : public BlitPass {
                                     std::string label) override;
 
   // |BlitPass|
-  bool OnOptimizeForGPUAccess(std::shared_ptr<Texture> texture,
-                              std::string label) override;
-  // |BlitPass|
   bool OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                std::string label) override;
 

impeller/renderer/blit_pass.cc

@@ -116,11 +116,6 @@ bool BlitPass::AddCopy(std::shared_ptr<Texture> source,
                                       std::move(label));
 }
 
-bool BlitPass::OptimizeForGPUAccess(std::shared_ptr<Texture> texture,
-                                    std::string label) {
-  return OnOptimizeForGPUAccess(std::move(texture), std::move(label));
-}
-
 bool BlitPass::GenerateMipmap(std::shared_ptr<Texture> texture,
                               std::string label) {
   if (!texture) {

impeller/renderer/blit_pass.h

@@ -95,19 +95,6 @@ class BlitPass {
   ///
   bool GenerateMipmap(std::shared_ptr<Texture> texture, std::string label = "");
 
-  //----------------------------------------------------------------------------
-  /// @brief      Optimize the provided texture for GPU access.
-  ///             This will no-op on platforms where this functionality is
-  ///             unsupported.
-  ///
-  /// @param[in]  texture  The texture to generate mipmaps for.
-  /// @param[in]  label    The optional debug label to give the command.
-  ///
-  /// @return     If the command was valid for subsequent commitment.
-  ///
-  bool OptimizeForGPUAccess(std::shared_ptr<Texture> texture,
-                            std::string label = "");
-
   //----------------------------------------------------------------------------
   /// @brief      Encode the recorded commands to the underlying command buffer.
   ///
@@ -140,9 +127,6 @@ class BlitPass {
       size_t destination_offset,
       std::string label) = 0;
 
-  virtual bool OnOptimizeForGPUAccess(std::shared_ptr<Texture> texture,
-                                      std::string label) = 0;
-
   virtual bool OnGenerateMipmapCommand(std::shared_ptr<Texture> texture,
                                        std::string label) = 0;