Removes ReactorGLES::Ref (#56981)
This typedef really wasn't making the codebase any easier to work with. We don't do this for other std::shared_ptr's
test-exempt: just removes typedef
[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
diff --git a/impeller/renderer/backend/gles/allocator_gles.cc b/impeller/renderer/backend/gles/allocator_gles.cc
index cd062d8..820ec22 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<ReactorGLES> 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 a01c39e..1472841 100644
--- a/impeller/renderer/backend/gles/allocator_gles.h
+++ b/impeller/renderer/backend/gles/allocator_gles.h
@@ -18,10 +18,10 @@
private:
friend class ContextGLES;
- ReactorGLES::Ref reactor_;
+ std::shared_ptr<ReactorGLES> reactor_;
bool is_valid_ = false;
- explicit AllocatorGLES(ReactorGLES::Ref reactor);
+ explicit AllocatorGLES(std::shared_ptr<ReactorGLES> 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 94d8300..7e8aaf9 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<ReactorGLES> 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 321bd42..f3780f4 100644
--- a/impeller/renderer/backend/gles/blit_pass_gles.h
+++ b/impeller/renderer/backend/gles/blit_pass_gles.h
@@ -25,11 +25,11 @@
friend class CommandBufferGLES;
std::vector<std::unique_ptr<BlitEncodeGLES>> commands_;
- ReactorGLES::Ref reactor_;
+ std::shared_ptr<ReactorGLES> reactor_;
std::string label_;
bool is_valid_ = false;
- explicit BlitPassGLES(ReactorGLES::Ref reactor);
+ explicit BlitPassGLES(std::shared_ptr<ReactorGLES> 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 4e0831f..4cd6b27 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<const Context> context,
- ReactorGLES::Ref reactor)
+ std::shared_ptr<ReactorGLES> 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 09570b1..c7baea2 100644
--- a/impeller/renderer/backend/gles/command_buffer_gles.h
+++ b/impeller/renderer/backend/gles/command_buffer_gles.h
@@ -19,11 +19,11 @@
private:
friend class ContextGLES;
- ReactorGLES::Ref reactor_;
+ std::shared_ptr<ReactorGLES> reactor_;
bool is_valid_ = false;
CommandBufferGLES(std::weak_ptr<const Context> context,
- ReactorGLES::Ref reactor);
+ std::shared_ptr<ReactorGLES> 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 c0c4c4c..f8cf284 100644
--- a/impeller/renderer/backend/gles/context_gles.cc
+++ b/impeller/renderer/backend/gles/context_gles.cc
@@ -83,7 +83,7 @@
return Context::BackendType::kOpenGLES;
}
-const ReactorGLES::Ref& ContextGLES::GetReactor() const {
+const std::shared_ptr<ReactorGLES>& ContextGLES::GetReactor() const {
return reactor_;
}
diff --git a/impeller/renderer/backend/gles/context_gles.h b/impeller/renderer/backend/gles/context_gles.h
index 8184830..2e7e87a 100644
--- a/impeller/renderer/backend/gles/context_gles.h
+++ b/impeller/renderer/backend/gles/context_gles.h
@@ -35,7 +35,7 @@
// |Context|
BackendType GetBackendType() const override;
- const ReactorGLES::Ref& GetReactor() const;
+ const std::shared_ptr<ReactorGLES>& GetReactor() const;
std::optional<ReactorGLES::WorkerID> AddReactorWorker(
const std::shared_ptr<ReactorGLES::Worker>& worker);
@@ -45,7 +45,7 @@
std::shared_ptr<GPUTracerGLES> GetGPUTracer() const { return gpu_tracer_; }
private:
- ReactorGLES::Ref reactor_;
+ std::shared_ptr<ReactorGLES> reactor_;
std::shared_ptr<ShaderLibraryGLES> shader_library_;
std::shared_ptr<PipelineLibraryGLES> pipeline_library_;
std::shared_ptr<SamplerLibraryGLES> sampler_library_;
diff --git a/impeller/renderer/backend/gles/device_buffer_gles.cc b/impeller/renderer/backend/gles/device_buffer_gles.cc
index c477b75..b072a8e 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<ReactorGLES> reactor,
std::shared_ptr<Allocation> 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 8fe5c69..8255995 100644
--- a/impeller/renderer/backend/gles/device_buffer_gles.h
+++ b/impeller/renderer/backend/gles/device_buffer_gles.h
@@ -20,7 +20,7 @@
public BackendCast<DeviceBufferGLES, DeviceBuffer> {
public:
DeviceBufferGLES(DeviceBufferDescriptor desc,
- ReactorGLES::Ref reactor,
+ std::shared_ptr<ReactorGLES> reactor,
std::shared_ptr<Allocation> backing_store);
// |DeviceBuffer|
@@ -44,7 +44,7 @@
std::optional<GLuint> GetHandle() const;
private:
- ReactorGLES::Ref reactor_;
+ std::shared_ptr<ReactorGLES> reactor_;
HandleGLES handle_;
mutable std::shared_ptr<Allocation> backing_store_;
mutable std::optional<Range> dirty_range_ = std::nullopt;
diff --git a/impeller/renderer/backend/gles/pipeline_gles.cc b/impeller/renderer/backend/gles/pipeline_gles.cc
index 557eca2..e173ce1 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<ReactorGLES> reactor,
std::weak_ptr<PipelineLibrary> library,
const PipelineDescriptor& desc,
std::shared_ptr<UniqueHandleGLES> handle)
diff --git a/impeller/renderer/backend/gles/pipeline_gles.h b/impeller/renderer/backend/gles/pipeline_gles.h
index e8a3ae8..0db8414 100644
--- a/impeller/renderer/backend/gles/pipeline_gles.h
+++ b/impeller/renderer/backend/gles/pipeline_gles.h
@@ -38,7 +38,7 @@
private:
friend PipelineLibraryGLES;
- ReactorGLES::Ref reactor_;
+ std::shared_ptr<ReactorGLES> reactor_;
std::shared_ptr<UniqueHandleGLES> handle_;
std::unique_ptr<BufferBindingsGLES> buffer_bindings_;
bool is_valid_ = false;
@@ -46,7 +46,7 @@
// |Pipeline|
bool IsValid() const override;
- PipelineGLES(ReactorGLES::Ref reactor,
+ PipelineGLES(std::shared_ptr<ReactorGLES> reactor,
std::weak_ptr<PipelineLibrary> library,
const PipelineDescriptor& desc,
std::shared_ptr<UniqueHandleGLES> handle);
diff --git a/impeller/renderer/backend/gles/pipeline_library_gles.cc b/impeller/renderer/backend/gles/pipeline_library_gles.cc
index 791716e..199af70 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<ReactorGLES> reactor)
: reactor_(std::move(reactor)) {}
static std::string GetShaderInfoLog(const ProcTableGLES& gl, GLuint shader) {
@@ -324,7 +324,7 @@
// |PipelineLibrary|
PipelineLibraryGLES::~PipelineLibraryGLES() = default;
-const ReactorGLES::Ref& PipelineLibraryGLES::GetReactor() const {
+const std::shared_ptr<ReactorGLES>& 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 e8b5c04..3b9f29f 100644
--- a/impeller/renderer/backend/gles/pipeline_library_gles.h
+++ b/impeller/renderer/backend/gles/pipeline_library_gles.h
@@ -87,12 +87,12 @@
ProgramKey::Hash,
ProgramKey::Equal>;
- ReactorGLES::Ref reactor_;
+ std::shared_ptr<ReactorGLES> reactor_;
PipelineMap pipelines_;
Mutex programs_mutex_;
ProgramMap programs_ IPLR_GUARDED_BY(programs_mutex_);
- explicit PipelineLibraryGLES(ReactorGLES::Ref reactor);
+ explicit PipelineLibraryGLES(std::shared_ptr<ReactorGLES> reactor);
// |PipelineLibrary|
bool IsValid() const override;
@@ -113,7 +113,7 @@
void RemovePipelinesWithEntryPoint(
std::shared_ptr<const ShaderFunction> function) override;
- const ReactorGLES::Ref& GetReactor() const;
+ const std::shared_ptr<ReactorGLES>& GetReactor() const;
static std::shared_ptr<PipelineGLES> CreatePipeline(
const std::weak_ptr<PipelineLibrary>& weak_library,
diff --git a/impeller/renderer/backend/gles/reactor_gles.h b/impeller/renderer/backend/gles/reactor_gles.h
index 4919193..a05dd22 100644
--- a/impeller/renderer/backend/gles/reactor_gles.h
+++ b/impeller/renderer/backend/gles/reactor_gles.h
@@ -85,8 +85,6 @@
const ReactorGLES& reactor) const = 0;
};
- using Ref = std::shared_ptr<ReactorGLES>;
-
//----------------------------------------------------------------------------
/// @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 c1308ee..24b0cce 100644
--- a/impeller/renderer/backend/gles/render_pass_gles.cc
+++ b/impeller/renderer/backend/gles/render_pass_gles.cc
@@ -24,7 +24,7 @@
RenderPassGLES::RenderPassGLES(std::shared_ptr<const Context> context,
const RenderTarget& target,
- ReactorGLES::Ref reactor)
+ std::shared_ptr<ReactorGLES> 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 c0bd9e6..1d524fd 100644
--- a/impeller/renderer/backend/gles/render_pass_gles.h
+++ b/impeller/renderer/backend/gles/render_pass_gles.h
@@ -24,13 +24,13 @@
private:
friend class CommandBufferGLES;
- ReactorGLES::Ref reactor_;
+ std::shared_ptr<ReactorGLES> reactor_;
std::string label_;
bool is_valid_ = false;
RenderPassGLES(std::shared_ptr<const Context> context,
const RenderTarget& target,
- ReactorGLES::Ref reactor);
+ std::shared_ptr<ReactorGLES> 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 0b96430..e85aeb3 100644
--- a/impeller/renderer/backend/gles/texture_gles.cc
+++ b/impeller/renderer/backend/gles/texture_gles.cc
@@ -140,9 +140,10 @@
FML_UNREACHABLE();
}
-std::shared_ptr<TextureGLES> TextureGLES::WrapFBO(ReactorGLES::Ref reactor,
- TextureDescriptor desc,
- GLuint fbo) {
+std::shared_ptr<TextureGLES> TextureGLES::WrapFBO(
+ std::shared_ptr<ReactorGLES> reactor,
+ TextureDescriptor desc,
+ GLuint fbo) {
auto texture = std::shared_ptr<TextureGLES>(
new TextureGLES(std::move(reactor), desc, fbo, std::nullopt));
if (!texture->IsValid()) {
@@ -152,7 +153,7 @@
}
std::shared_ptr<TextureGLES> TextureGLES::WrapTexture(
- ReactorGLES::Ref reactor,
+ std::shared_ptr<ReactorGLES> reactor,
TextureDescriptor desc,
HandleGLES external_handle) {
if (external_handle.IsDead()) {
@@ -172,12 +173,13 @@
}
std::shared_ptr<TextureGLES> TextureGLES::CreatePlaceholder(
- ReactorGLES::Ref reactor,
+ std::shared_ptr<ReactorGLES> reactor,
TextureDescriptor desc) {
return TextureGLES::WrapFBO(std::move(reactor), desc, 0u);
}
-TextureGLES::TextureGLES(ReactorGLES::Ref reactor, TextureDescriptor desc)
+TextureGLES::TextureGLES(std::shared_ptr<ReactorGLES> 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 36f5693..597fb72 100644
--- a/impeller/renderer/backend/gles/texture_gles.h
+++ b/impeller/renderer/backend/gles/texture_gles.h
@@ -39,9 +39,10 @@
/// @return If a texture representation of the framebuffer could be
/// created.
///
- static std::shared_ptr<TextureGLES> WrapFBO(ReactorGLES::Ref reactor,
- TextureDescriptor desc,
- GLuint fbo);
+ static std::shared_ptr<TextureGLES> WrapFBO(
+ std::shared_ptr<ReactorGLES> reactor,
+ TextureDescriptor desc,
+ GLuint fbo);
//----------------------------------------------------------------------------
/// @brief Create a texture by wrapping an external OpenGL texture
@@ -55,9 +56,10 @@
/// @return If a texture representation of the framebuffer could be
/// created.
///
- static std::shared_ptr<TextureGLES> WrapTexture(ReactorGLES::Ref reactor,
- TextureDescriptor desc,
- HandleGLES external_handle);
+ static std::shared_ptr<TextureGLES> WrapTexture(
+ std::shared_ptr<ReactorGLES> reactor,
+ TextureDescriptor desc,
+ HandleGLES external_handle);
//----------------------------------------------------------------------------
/// @brief Create a "texture" that is never expected to be bound/unbound
@@ -70,10 +72,10 @@
/// @return If a texture placeholder could be created.
///
static std::shared_ptr<TextureGLES> CreatePlaceholder(
- ReactorGLES::Ref reactor,
+ std::shared_ptr<ReactorGLES> reactor,
TextureDescriptor desc);
- TextureGLES(ReactorGLES::Ref reactor, TextureDescriptor desc);
+ TextureGLES(std::shared_ptr<ReactorGLES> reactor, TextureDescriptor desc);
// |Texture|
~TextureGLES() override;
@@ -143,7 +145,7 @@
std::optional<HandleGLES> GetSyncFence() const;
private:
- ReactorGLES::Ref reactor_;
+ std::shared_ptr<ReactorGLES> reactor_;
const Type type_;
HandleGLES handle_;
mutable std::optional<HandleGLES> fence_ = std::nullopt;
diff --git a/impeller/renderer/backend/gles/unique_handle_gles.cc b/impeller/renderer/backend/gles/unique_handle_gles.cc
index 012900d..d45dd4d 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<ReactorGLES> reactor,
+ HandleType type)
: reactor_(std::move(reactor)) {
if (reactor_) {
handle_ = reactor_->CreateHandle(type);
@@ -16,14 +17,16 @@
}
// static
-UniqueHandleGLES UniqueHandleGLES::MakeUntracked(ReactorGLES::Ref reactor,
- HandleType type) {
+UniqueHandleGLES UniqueHandleGLES::MakeUntracked(
+ std::shared_ptr<ReactorGLES> 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<ReactorGLES> 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 d005aa0..e5bbc33 100644
--- a/impeller/renderer/backend/gles/unique_handle_gles.h
+++ b/impeller/renderer/backend/gles/unique_handle_gles.h
@@ -17,12 +17,12 @@
///
class UniqueHandleGLES {
public:
- UniqueHandleGLES(ReactorGLES::Ref reactor, HandleType type);
+ UniqueHandleGLES(std::shared_ptr<ReactorGLES> reactor, HandleType type);
- static UniqueHandleGLES MakeUntracked(ReactorGLES::Ref reactor,
+ static UniqueHandleGLES MakeUntracked(std::shared_ptr<ReactorGLES> reactor,
HandleType type);
- UniqueHandleGLES(ReactorGLES::Ref reactor, HandleGLES handle);
+ UniqueHandleGLES(std::shared_ptr<ReactorGLES> reactor, HandleGLES handle);
~UniqueHandleGLES();
@@ -37,7 +37,7 @@
bool IsValid() const;
private:
- ReactorGLES::Ref reactor_ = nullptr;
+ std::shared_ptr<ReactorGLES> reactor_ = nullptr;
HandleGLES handle_ = HandleGLES::DeadHandle();
};
