From 66120bcd8c626a93ec30ac836883ab5eba3bd058 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Thu, 5 Dec 2024 09:26:57 -0800 Subject: [PATCH] Removed ReactorGLES::Ref typdef --- .../renderer/backend/gles/allocator_gles.cc | 2 +- .../renderer/backend/gles/allocator_gles.h | 4 ++-- .../renderer/backend/gles/blit_pass_gles.cc | 2 +- .../renderer/backend/gles/blit_pass_gles.h | 4 ++-- .../backend/gles/command_buffer_gles.cc | 2 +- .../backend/gles/command_buffer_gles.h | 4 ++-- .../renderer/backend/gles/context_gles.cc | 2 +- impeller/renderer/backend/gles/context_gles.h | 4 ++-- .../backend/gles/device_buffer_gles.cc | 2 +- .../backend/gles/device_buffer_gles.h | 4 ++-- .../renderer/backend/gles/pipeline_gles.cc | 2 +- .../renderer/backend/gles/pipeline_gles.h | 4 ++-- .../backend/gles/pipeline_library_gles.cc | 4 ++-- .../backend/gles/pipeline_library_gles.h | 6 +++--- impeller/renderer/backend/gles/reactor_gles.h | 2 -- .../renderer/backend/gles/render_pass_gles.cc | 2 +- .../renderer/backend/gles/render_pass_gles.h | 4 ++-- .../renderer/backend/gles/texture_gles.cc | 14 +++++++------ impeller/renderer/backend/gles/texture_gles.h | 20 ++++++++++--------- .../backend/gles/unique_handle_gles.cc | 11 ++++++---- .../backend/gles/unique_handle_gles.h | 8 ++++---- 21 files changed, 56 insertions(+), 51 deletions(-) diff --git a/impeller/renderer/backend/gles/allocator_gles.cc b/impeller/renderer/backend/gles/allocator_gles.cc index cd062d8a445e3..820ec22d69163 100644 --- a/impeller/renderer/backend/gles/allocator_gles.cc +++ b/impeller/renderer/backend/gles/allocator_gles.cc @@ -13,7 +13,7 @@ namespace impeller { -AllocatorGLES::AllocatorGLES(ReactorGLES::Ref reactor) +AllocatorGLES::AllocatorGLES(std::shared_ptr reactor) : reactor_(std::move(reactor)), is_valid_(true) {} // |Allocator| diff --git a/impeller/renderer/backend/gles/allocator_gles.h b/impeller/renderer/backend/gles/allocator_gles.h index a01c39e9597a8..14728414f467e 100644 --- a/impeller/renderer/backend/gles/allocator_gles.h +++ b/impeller/renderer/backend/gles/allocator_gles.h @@ -18,10 +18,10 @@ class AllocatorGLES final : public Allocator { private: friend class ContextGLES; - ReactorGLES::Ref reactor_; + std::shared_ptr reactor_; bool is_valid_ = false; - explicit AllocatorGLES(ReactorGLES::Ref reactor); + explicit AllocatorGLES(std::shared_ptr reactor); // |Allocator| bool IsValid() const; diff --git a/impeller/renderer/backend/gles/blit_pass_gles.cc b/impeller/renderer/backend/gles/blit_pass_gles.cc index 94d830001eb98..7e8aaf9238d1f 100644 --- a/impeller/renderer/backend/gles/blit_pass_gles.cc +++ b/impeller/renderer/backend/gles/blit_pass_gles.cc @@ -14,7 +14,7 @@ namespace impeller { -BlitPassGLES::BlitPassGLES(ReactorGLES::Ref reactor) +BlitPassGLES::BlitPassGLES(std::shared_ptr reactor) : reactor_(std::move(reactor)), is_valid_(reactor_ && reactor_->IsValid()) {} diff --git a/impeller/renderer/backend/gles/blit_pass_gles.h b/impeller/renderer/backend/gles/blit_pass_gles.h index 321bd42dc9e8a..f3780f4bd41b2 100644 --- a/impeller/renderer/backend/gles/blit_pass_gles.h +++ b/impeller/renderer/backend/gles/blit_pass_gles.h @@ -25,11 +25,11 @@ class BlitPassGLES final : public BlitPass, friend class CommandBufferGLES; std::vector> commands_; - ReactorGLES::Ref reactor_; + std::shared_ptr reactor_; std::string label_; bool is_valid_ = false; - explicit BlitPassGLES(ReactorGLES::Ref reactor); + explicit BlitPassGLES(std::shared_ptr reactor); // |BlitPass| bool IsValid() const override; diff --git a/impeller/renderer/backend/gles/command_buffer_gles.cc b/impeller/renderer/backend/gles/command_buffer_gles.cc index 4e0831f9e3a10..4cd6b279b9e18 100644 --- a/impeller/renderer/backend/gles/command_buffer_gles.cc +++ b/impeller/renderer/backend/gles/command_buffer_gles.cc @@ -11,7 +11,7 @@ namespace impeller { CommandBufferGLES::CommandBufferGLES(std::weak_ptr context, - ReactorGLES::Ref reactor) + std::shared_ptr reactor) : CommandBuffer(std::move(context)), reactor_(std::move(reactor)), is_valid_(reactor_ && reactor_->IsValid()) {} diff --git a/impeller/renderer/backend/gles/command_buffer_gles.h b/impeller/renderer/backend/gles/command_buffer_gles.h index 09570b19a955b..c7baea2d7bf15 100644 --- a/impeller/renderer/backend/gles/command_buffer_gles.h +++ b/impeller/renderer/backend/gles/command_buffer_gles.h @@ -19,11 +19,11 @@ class CommandBufferGLES final : public CommandBuffer { private: friend class ContextGLES; - ReactorGLES::Ref reactor_; + std::shared_ptr reactor_; bool is_valid_ = false; CommandBufferGLES(std::weak_ptr context, - ReactorGLES::Ref reactor); + std::shared_ptr reactor); // |CommandBuffer| void SetLabel(std::string_view label) const override; diff --git a/impeller/renderer/backend/gles/context_gles.cc b/impeller/renderer/backend/gles/context_gles.cc index ba98e78f5cbe5..336f827a5be0f 100644 --- a/impeller/renderer/backend/gles/context_gles.cc +++ b/impeller/renderer/backend/gles/context_gles.cc @@ -81,7 +81,7 @@ Context::BackendType ContextGLES::GetBackendType() const { return Context::BackendType::kOpenGLES; } -const ReactorGLES::Ref& ContextGLES::GetReactor() const { +const std::shared_ptr& ContextGLES::GetReactor() const { return reactor_; } diff --git a/impeller/renderer/backend/gles/context_gles.h b/impeller/renderer/backend/gles/context_gles.h index 1c2587cc0d276..17c31f3215fea 100644 --- a/impeller/renderer/backend/gles/context_gles.h +++ b/impeller/renderer/backend/gles/context_gles.h @@ -34,7 +34,7 @@ class ContextGLES final : public Context, // |Context| BackendType GetBackendType() const override; - const ReactorGLES::Ref& GetReactor() const; + const std::shared_ptr& GetReactor() const; std::optional AddReactorWorker( const std::shared_ptr& worker); @@ -44,7 +44,7 @@ class ContextGLES final : public Context, std::shared_ptr GetGPUTracer() const { return gpu_tracer_; } private: - ReactorGLES::Ref reactor_; + std::shared_ptr reactor_; std::shared_ptr shader_library_; std::shared_ptr pipeline_library_; std::shared_ptr sampler_library_; diff --git a/impeller/renderer/backend/gles/device_buffer_gles.cc b/impeller/renderer/backend/gles/device_buffer_gles.cc index f4caaf5af874d..2c13472459bbc 100644 --- a/impeller/renderer/backend/gles/device_buffer_gles.cc +++ b/impeller/renderer/backend/gles/device_buffer_gles.cc @@ -13,7 +13,7 @@ namespace impeller { DeviceBufferGLES::DeviceBufferGLES(DeviceBufferDescriptor desc, - ReactorGLES::Ref reactor, + std::shared_ptr reactor, std::shared_ptr backing_store) : DeviceBuffer(desc), reactor_(std::move(reactor)), diff --git a/impeller/renderer/backend/gles/device_buffer_gles.h b/impeller/renderer/backend/gles/device_buffer_gles.h index a18e010dc2649..90ec550d4d5b4 100644 --- a/impeller/renderer/backend/gles/device_buffer_gles.h +++ b/impeller/renderer/backend/gles/device_buffer_gles.h @@ -20,7 +20,7 @@ class DeviceBufferGLES final public BackendCast { public: DeviceBufferGLES(DeviceBufferDescriptor desc, - ReactorGLES::Ref reactor, + std::shared_ptr reactor, std::shared_ptr backing_store); // |DeviceBuffer| @@ -41,7 +41,7 @@ class DeviceBufferGLES final void Flush(std::optional range = std::nullopt) const override; private: - ReactorGLES::Ref reactor_; + std::shared_ptr reactor_; HandleGLES handle_; mutable std::shared_ptr backing_store_; mutable std::optional dirty_range_ = std::nullopt; diff --git a/impeller/renderer/backend/gles/pipeline_gles.cc b/impeller/renderer/backend/gles/pipeline_gles.cc index 557eca2b48443..e173ce167be85 100644 --- a/impeller/renderer/backend/gles/pipeline_gles.cc +++ b/impeller/renderer/backend/gles/pipeline_gles.cc @@ -6,7 +6,7 @@ namespace impeller { -PipelineGLES::PipelineGLES(ReactorGLES::Ref reactor, +PipelineGLES::PipelineGLES(std::shared_ptr reactor, std::weak_ptr library, const PipelineDescriptor& desc, std::shared_ptr handle) diff --git a/impeller/renderer/backend/gles/pipeline_gles.h b/impeller/renderer/backend/gles/pipeline_gles.h index e8a3ae8225bf4..0db8414f9a418 100644 --- a/impeller/renderer/backend/gles/pipeline_gles.h +++ b/impeller/renderer/backend/gles/pipeline_gles.h @@ -38,7 +38,7 @@ class PipelineGLES final private: friend PipelineLibraryGLES; - ReactorGLES::Ref reactor_; + std::shared_ptr reactor_; std::shared_ptr handle_; std::unique_ptr buffer_bindings_; bool is_valid_ = false; @@ -46,7 +46,7 @@ class PipelineGLES final // |Pipeline| bool IsValid() const override; - PipelineGLES(ReactorGLES::Ref reactor, + PipelineGLES(std::shared_ptr reactor, std::weak_ptr library, const PipelineDescriptor& desc, std::shared_ptr handle); diff --git a/impeller/renderer/backend/gles/pipeline_library_gles.cc b/impeller/renderer/backend/gles/pipeline_library_gles.cc index 791716e802339..199af7068ac26 100644 --- a/impeller/renderer/backend/gles/pipeline_library_gles.cc +++ b/impeller/renderer/backend/gles/pipeline_library_gles.cc @@ -16,7 +16,7 @@ namespace impeller { -PipelineLibraryGLES::PipelineLibraryGLES(ReactorGLES::Ref reactor) +PipelineLibraryGLES::PipelineLibraryGLES(std::shared_ptr reactor) : reactor_(std::move(reactor)) {} static std::string GetShaderInfoLog(const ProcTableGLES& gl, GLuint shader) { @@ -324,7 +324,7 @@ void PipelineLibraryGLES::RemovePipelinesWithEntryPoint( // |PipelineLibrary| PipelineLibraryGLES::~PipelineLibraryGLES() = default; -const ReactorGLES::Ref& PipelineLibraryGLES::GetReactor() const { +const std::shared_ptr& PipelineLibraryGLES::GetReactor() const { return reactor_; } diff --git a/impeller/renderer/backend/gles/pipeline_library_gles.h b/impeller/renderer/backend/gles/pipeline_library_gles.h index e8b5c0433d88a..3b9f29f7d2274 100644 --- a/impeller/renderer/backend/gles/pipeline_library_gles.h +++ b/impeller/renderer/backend/gles/pipeline_library_gles.h @@ -87,12 +87,12 @@ class PipelineLibraryGLES final ProgramKey::Hash, ProgramKey::Equal>; - ReactorGLES::Ref reactor_; + std::shared_ptr reactor_; PipelineMap pipelines_; Mutex programs_mutex_; ProgramMap programs_ IPLR_GUARDED_BY(programs_mutex_); - explicit PipelineLibraryGLES(ReactorGLES::Ref reactor); + explicit PipelineLibraryGLES(std::shared_ptr reactor); // |PipelineLibrary| bool IsValid() const override; @@ -113,7 +113,7 @@ class PipelineLibraryGLES final void RemovePipelinesWithEntryPoint( std::shared_ptr function) override; - const ReactorGLES::Ref& GetReactor() const; + const std::shared_ptr& GetReactor() const; static std::shared_ptr CreatePipeline( const std::weak_ptr& weak_library, diff --git a/impeller/renderer/backend/gles/reactor_gles.h b/impeller/renderer/backend/gles/reactor_gles.h index 49191932e0d6a..a05dd22b8fb42 100644 --- a/impeller/renderer/backend/gles/reactor_gles.h +++ b/impeller/renderer/backend/gles/reactor_gles.h @@ -85,8 +85,6 @@ class ReactorGLES { const ReactorGLES& reactor) const = 0; }; - using Ref = std::shared_ptr; - //---------------------------------------------------------------------------- /// @brief Create a new reactor. There are expensive and only one per /// application instance is necessary. diff --git a/impeller/renderer/backend/gles/render_pass_gles.cc b/impeller/renderer/backend/gles/render_pass_gles.cc index c1308ee445068..24b0ccecd991a 100644 --- a/impeller/renderer/backend/gles/render_pass_gles.cc +++ b/impeller/renderer/backend/gles/render_pass_gles.cc @@ -24,7 +24,7 @@ namespace impeller { RenderPassGLES::RenderPassGLES(std::shared_ptr context, const RenderTarget& target, - ReactorGLES::Ref reactor) + std::shared_ptr reactor) : RenderPass(std::move(context), target), reactor_(std::move(reactor)), is_valid_(reactor_ && reactor_->IsValid()) {} diff --git a/impeller/renderer/backend/gles/render_pass_gles.h b/impeller/renderer/backend/gles/render_pass_gles.h index c0bd9e63e6cef..1d524fdc490a1 100644 --- a/impeller/renderer/backend/gles/render_pass_gles.h +++ b/impeller/renderer/backend/gles/render_pass_gles.h @@ -24,13 +24,13 @@ class RenderPassGLES final private: friend class CommandBufferGLES; - ReactorGLES::Ref reactor_; + std::shared_ptr reactor_; std::string label_; bool is_valid_ = false; RenderPassGLES(std::shared_ptr context, const RenderTarget& target, - ReactorGLES::Ref reactor); + std::shared_ptr reactor); // |RenderPass| bool IsValid() const override; diff --git a/impeller/renderer/backend/gles/texture_gles.cc b/impeller/renderer/backend/gles/texture_gles.cc index 0b964306383ff..e85aeb3772111 100644 --- a/impeller/renderer/backend/gles/texture_gles.cc +++ b/impeller/renderer/backend/gles/texture_gles.cc @@ -140,9 +140,10 @@ HandleType ToHandleType(TextureGLES::Type type) { FML_UNREACHABLE(); } -std::shared_ptr TextureGLES::WrapFBO(ReactorGLES::Ref reactor, - TextureDescriptor desc, - GLuint fbo) { +std::shared_ptr TextureGLES::WrapFBO( + std::shared_ptr reactor, + TextureDescriptor desc, + GLuint fbo) { auto texture = std::shared_ptr( new TextureGLES(std::move(reactor), desc, fbo, std::nullopt)); if (!texture->IsValid()) { @@ -152,7 +153,7 @@ std::shared_ptr TextureGLES::WrapFBO(ReactorGLES::Ref reactor, } std::shared_ptr TextureGLES::WrapTexture( - ReactorGLES::Ref reactor, + std::shared_ptr reactor, TextureDescriptor desc, HandleGLES external_handle) { if (external_handle.IsDead()) { @@ -172,12 +173,13 @@ std::shared_ptr TextureGLES::WrapTexture( } std::shared_ptr TextureGLES::CreatePlaceholder( - ReactorGLES::Ref reactor, + std::shared_ptr reactor, TextureDescriptor desc) { return TextureGLES::WrapFBO(std::move(reactor), desc, 0u); } -TextureGLES::TextureGLES(ReactorGLES::Ref reactor, TextureDescriptor desc) +TextureGLES::TextureGLES(std::shared_ptr reactor, + TextureDescriptor desc) : TextureGLES(std::move(reactor), // desc, // std::nullopt, // diff --git a/impeller/renderer/backend/gles/texture_gles.h b/impeller/renderer/backend/gles/texture_gles.h index 36f569379f70e..597fb726b21c7 100644 --- a/impeller/renderer/backend/gles/texture_gles.h +++ b/impeller/renderer/backend/gles/texture_gles.h @@ -39,9 +39,10 @@ class TextureGLES final : public Texture, /// @return If a texture representation of the framebuffer could be /// created. /// - static std::shared_ptr WrapFBO(ReactorGLES::Ref reactor, - TextureDescriptor desc, - GLuint fbo); + static std::shared_ptr WrapFBO( + std::shared_ptr reactor, + TextureDescriptor desc, + GLuint fbo); //---------------------------------------------------------------------------- /// @brief Create a texture by wrapping an external OpenGL texture @@ -55,9 +56,10 @@ class TextureGLES final : public Texture, /// @return If a texture representation of the framebuffer could be /// created. /// - static std::shared_ptr WrapTexture(ReactorGLES::Ref reactor, - TextureDescriptor desc, - HandleGLES external_handle); + static std::shared_ptr WrapTexture( + std::shared_ptr reactor, + TextureDescriptor desc, + HandleGLES external_handle); //---------------------------------------------------------------------------- /// @brief Create a "texture" that is never expected to be bound/unbound @@ -70,10 +72,10 @@ class TextureGLES final : public Texture, /// @return If a texture placeholder could be created. /// static std::shared_ptr CreatePlaceholder( - ReactorGLES::Ref reactor, + std::shared_ptr reactor, TextureDescriptor desc); - TextureGLES(ReactorGLES::Ref reactor, TextureDescriptor desc); + TextureGLES(std::shared_ptr reactor, TextureDescriptor desc); // |Texture| ~TextureGLES() override; @@ -143,7 +145,7 @@ class TextureGLES final : public Texture, std::optional GetSyncFence() const; private: - ReactorGLES::Ref reactor_; + std::shared_ptr reactor_; const Type type_; HandleGLES handle_; mutable std::optional fence_ = std::nullopt; diff --git a/impeller/renderer/backend/gles/unique_handle_gles.cc b/impeller/renderer/backend/gles/unique_handle_gles.cc index 012900d28b1cd..d45dd4d79a550 100644 --- a/impeller/renderer/backend/gles/unique_handle_gles.cc +++ b/impeller/renderer/backend/gles/unique_handle_gles.cc @@ -8,7 +8,8 @@ namespace impeller { -UniqueHandleGLES::UniqueHandleGLES(ReactorGLES::Ref reactor, HandleType type) +UniqueHandleGLES::UniqueHandleGLES(std::shared_ptr reactor, + HandleType type) : reactor_(std::move(reactor)) { if (reactor_) { handle_ = reactor_->CreateHandle(type); @@ -16,14 +17,16 @@ UniqueHandleGLES::UniqueHandleGLES(ReactorGLES::Ref reactor, HandleType type) } // static -UniqueHandleGLES UniqueHandleGLES::MakeUntracked(ReactorGLES::Ref reactor, - HandleType type) { +UniqueHandleGLES UniqueHandleGLES::MakeUntracked( + std::shared_ptr reactor, + HandleType type) { FML_DCHECK(reactor); HandleGLES handle = reactor->CreateUntrackedHandle(type); return UniqueHandleGLES(std::move(reactor), handle); } -UniqueHandleGLES::UniqueHandleGLES(ReactorGLES::Ref reactor, HandleGLES handle) +UniqueHandleGLES::UniqueHandleGLES(std::shared_ptr reactor, + HandleGLES handle) : reactor_(std::move(reactor)), handle_(handle) {} UniqueHandleGLES::~UniqueHandleGLES() { diff --git a/impeller/renderer/backend/gles/unique_handle_gles.h b/impeller/renderer/backend/gles/unique_handle_gles.h index d005aa0cc346a..e5bbc33293bdc 100644 --- a/impeller/renderer/backend/gles/unique_handle_gles.h +++ b/impeller/renderer/backend/gles/unique_handle_gles.h @@ -17,12 +17,12 @@ namespace impeller { /// class UniqueHandleGLES { public: - UniqueHandleGLES(ReactorGLES::Ref reactor, HandleType type); + UniqueHandleGLES(std::shared_ptr reactor, HandleType type); - static UniqueHandleGLES MakeUntracked(ReactorGLES::Ref reactor, + static UniqueHandleGLES MakeUntracked(std::shared_ptr reactor, HandleType type); - UniqueHandleGLES(ReactorGLES::Ref reactor, HandleGLES handle); + UniqueHandleGLES(std::shared_ptr reactor, HandleGLES handle); ~UniqueHandleGLES(); @@ -37,7 +37,7 @@ class UniqueHandleGLES { bool IsValid() const; private: - ReactorGLES::Ref reactor_ = nullptr; + std::shared_ptr reactor_ = nullptr; HandleGLES handle_ = HandleGLES::DeadHandle(); };