diff --git a/impeller/renderer/backend/gles/blit_pass_gles.cc b/impeller/renderer/backend/gles/blit_pass_gles.cc index 4819670db49fb..8685d86aa4a29 100644 --- a/impeller/renderer/backend/gles/blit_pass_gles.cc +++ b/impeller/renderer/backend/gles/blit_pass_gles.cc @@ -130,11 +130,6 @@ bool BlitPassGLES::OnCopyTextureToBufferCommand( return true; } -bool BlitPassGLES::OnOptimizeForGPUAccess(std::shared_ptr texture, - std::string label) { - return true; -} - // |BlitPass| bool BlitPassGLES::OnGenerateMipmapCommand(std::shared_ptr texture, std::string label) { diff --git a/impeller/renderer/backend/gles/blit_pass_gles.h b/impeller/renderer/backend/gles/blit_pass_gles.h index 146aedf953a1b..deaf1a41835f4 100644 --- a/impeller/renderer/backend/gles/blit_pass_gles.h +++ b/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, - std::string label) override; - // |BlitPass| bool OnGenerateMipmapCommand(std::shared_ptr texture, std::string label) override; diff --git a/impeller/renderer/backend/metal/blit_command_mtl.h b/impeller/renderer/backend/metal/blit_command_mtl.h index b1411ce8c8063..ffdd450f16c9b 100644 --- a/impeller/renderer/backend/metal/blit_command_mtl.h +++ b/impeller/renderer/backend/metal/blit_command_mtl.h @@ -50,13 +50,4 @@ struct BlitGenerateMipmapCommandMTL : public BlitGenerateMipmapCommand, [[nodiscard]] bool Encode(id encoder) const override; }; -struct BlitOptimizeGPUAccessCommandMTL : public BlitGenerateMipmapCommand, - public BlitEncodeMTL { - ~BlitOptimizeGPUAccessCommandMTL() override; - - std::string GetLabel() const override; - - [[nodiscard]] bool Encode(id encoder) const override; -}; - } // namespace impeller diff --git a/impeller/renderer/backend/metal/blit_command_mtl.mm b/impeller/renderer/backend/metal/blit_command_mtl.mm index 2981faef692c8..7f589b4f54175 100644 --- a/impeller/renderer/backend/metal/blit_command_mtl.mm +++ b/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 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 diff --git a/impeller/renderer/backend/metal/blit_pass_mtl.h b/impeller/renderer/backend/metal/blit_pass_mtl.h index 836273819da28..108d320d98bf0 100644 --- a/impeller/renderer/backend/metal/blit_pass_mtl.h +++ b/impeller/renderer/backend/metal/blit_pass_mtl.h @@ -57,10 +57,6 @@ class BlitPassMTL final : public BlitPass { bool OnGenerateMipmapCommand(std::shared_ptr texture, std::string label) override; - // |BlitPass| - bool OnOptimizeForGPUAccess(std::shared_ptr texture, - std::string label) override; - FML_DISALLOW_COPY_AND_ASSIGN(BlitPassMTL); }; diff --git a/impeller/renderer/backend/metal/blit_pass_mtl.mm b/impeller/renderer/backend/metal/blit_pass_mtl.mm index 9b084eb5f043b..74df114143655 100644 --- a/impeller/renderer/backend/metal/blit_pass_mtl.mm +++ b/impeller/renderer/backend/metal/blit_pass_mtl.mm @@ -134,15 +134,4 @@ return true; } -// |BlitPass| -bool BlitPassMTL::OnOptimizeForGPUAccess(std::shared_ptr texture, - std::string label) { - auto command = std::make_unique(); - command->label = label; - command->texture = std::move(texture); - - commands_.emplace_back(std::move(command)); - return true; -} - } // namespace impeller diff --git a/impeller/renderer/backend/vulkan/blit_pass_vk.cc b/impeller/renderer/backend/vulkan/blit_pass_vk.cc index e649a73d51b20..f563681af3455 100644 --- a/impeller/renderer/backend/vulkan/blit_pass_vk.cc +++ b/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, - std::string label) { - return true; -} - // |BlitPass| bool BlitPassVK::OnGenerateMipmapCommand(std::shared_ptr texture, std::string label) { diff --git a/impeller/renderer/backend/vulkan/blit_pass_vk.h b/impeller/renderer/backend/vulkan/blit_pass_vk.h index 72f8b40ea01e2..62e52c15477bc 100644 --- a/impeller/renderer/backend/vulkan/blit_pass_vk.h +++ b/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, - std::string label) override; - // |BlitPass| bool OnGenerateMipmapCommand(std::shared_ptr texture, std::string label) override; diff --git a/impeller/renderer/blit_pass.cc b/impeller/renderer/blit_pass.cc index 14760889e14aa..dd53e125645b5 100644 --- a/impeller/renderer/blit_pass.cc +++ b/impeller/renderer/blit_pass.cc @@ -116,11 +116,6 @@ bool BlitPass::AddCopy(std::shared_ptr source, std::move(label)); } -bool BlitPass::OptimizeForGPUAccess(std::shared_ptr texture, - std::string label) { - return OnOptimizeForGPUAccess(std::move(texture), std::move(label)); -} - bool BlitPass::GenerateMipmap(std::shared_ptr texture, std::string label) { if (!texture) { diff --git a/impeller/renderer/blit_pass.h b/impeller/renderer/blit_pass.h index 5341c20f62de5..7ac7b820e5972 100644 --- a/impeller/renderer/blit_pass.h +++ b/impeller/renderer/blit_pass.h @@ -95,19 +95,6 @@ class BlitPass { /// bool GenerateMipmap(std::shared_ptr 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, - 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, - std::string label) = 0; - virtual bool OnGenerateMipmapCommand(std::shared_ptr texture, std::string label) = 0; diff --git a/impeller/renderer/testing/mocks.h b/impeller/renderer/testing/mocks.h index 29f4faa01e37b..1f387ee58e05a 100644 --- a/impeller/renderer/testing/mocks.h +++ b/impeller/renderer/testing/mocks.h @@ -62,9 +62,6 @@ class MockBlitPass : public BlitPass { size_t destination_offset, std::string label)); - MOCK_METHOD2(OnOptimizeForGPUAccess, - bool(std::shared_ptr texture, std::string label)); - MOCK_METHOD2(OnGenerateMipmapCommand, bool(std::shared_ptr texture, std::string label)); }; diff --git a/lib/ui/painting/image_decoder_impeller.cc b/lib/ui/painting/image_decoder_impeller.cc index 3c6ba866e0da7..a6a130b3932c0 100644 --- a/lib/ui/painting/image_decoder_impeller.cc +++ b/lib/ui/painting/image_decoder_impeller.cc @@ -286,7 +286,6 @@ sk_sp ImageDecoderImpeller::UploadTexture( } blit_pass->SetLabel("Mipmap Blit Pass"); blit_pass->GenerateMipmap(texture); - blit_pass->OptimizeForGPUAccess(texture); blit_pass->EncodeCommands(context->GetResourceAllocator()); if (!command_buffer->SubmitCommands()) {