Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions impeller/renderer/backend/gles/command_buffer_gles.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ bool CommandBufferGLES::OnSubmitCommands(CompletionCallback callback) {
return result;
}

// |CommandBuffer|
void CommandBufferGLES::OnWaitUntilScheduled() {
reactor_->GetProcTable().Flush();
}

// |CommandBuffer|
std::shared_ptr<RenderPass> CommandBufferGLES::OnCreateRenderPass(
RenderTarget target) {
Expand Down
3 changes: 3 additions & 0 deletions impeller/renderer/backend/gles/command_buffer_gles.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ class CommandBufferGLES final : public CommandBuffer {
// |CommandBuffer|
bool OnSubmitCommands(CompletionCallback callback) override;

// |CommandBuffer|
void OnWaitUntilScheduled() override;

// |CommandBuffer|
std::shared_ptr<RenderPass> OnCreateRenderPass(RenderTarget target) override;

Expand Down
1 change: 1 addition & 0 deletions impeller/renderer/backend/gles/proc_table_gles.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ struct GLProc {
PROC(DrawElements); \
PROC(Enable); \
PROC(EnableVertexAttribArray); \
PROC(Flush); \
PROC(FramebufferRenderbuffer); \
PROC(FramebufferTexture2D); \
PROC(FrontFace); \
Expand Down
3 changes: 3 additions & 0 deletions impeller/renderer/backend/metal/command_buffer_mtl.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class CommandBufferMTL final : public CommandBuffer {
// |CommandBuffer|
bool OnSubmitCommands(CompletionCallback callback) override;

// |CommandBuffer|
void OnWaitUntilScheduled() override;

// |CommandBuffer|
std::shared_ptr<RenderPass> OnCreateRenderPass(RenderTarget target) override;

Expand Down
2 changes: 2 additions & 0 deletions impeller/renderer/backend/metal/command_buffer_mtl.mm
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ static bool LogMTLCommandBufferErrorIfPresent(id<MTLCommandBuffer> buffer) {
return true;
}

void CommandBufferMTL::OnWaitUntilScheduled() {}

std::shared_ptr<RenderPass> CommandBufferMTL::OnCreateRenderPass(
RenderTarget target) {
if (!buffer_) {
Expand Down
2 changes: 2 additions & 0 deletions impeller/renderer/backend/vulkan/command_buffer_vk.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ bool CommandBufferVK::OnSubmitCommands(CompletionCallback callback) {
return submit;
}

void CommandBufferVK::OnWaitUntilScheduled() {}

std::shared_ptr<RenderPass> CommandBufferVK::OnCreateRenderPass(
RenderTarget target) {
auto context = context_.lock();
Expand Down
3 changes: 3 additions & 0 deletions impeller/renderer/backend/vulkan/command_buffer_vk.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ class CommandBufferVK final
// |CommandBuffer|
bool OnSubmitCommands(CompletionCallback callback) override;

// |CommandBuffer|
void OnWaitUntilScheduled() override;

// |CommandBuffer|
std::shared_ptr<RenderPass> OnCreateRenderPass(RenderTarget target) override;

Expand Down
4 changes: 4 additions & 0 deletions impeller/renderer/command_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ bool CommandBuffer::SubmitCommands() {
return SubmitCommands(nullptr);
}

void CommandBuffer::WaitUntilScheduled() {
return OnWaitUntilScheduled();
}

std::shared_ptr<RenderPass> CommandBuffer::CreateRenderPass(
const RenderTarget& render_target) {
auto pass = OnCreateRenderPass(render_target);
Expand Down
7 changes: 7 additions & 0 deletions impeller/renderer/command_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ class CommandBuffer {

[[nodiscard]] bool SubmitCommands();

//----------------------------------------------------------------------------
/// @brief Force execution of pending GPU commands.
///
void WaitUntilScheduled();

//----------------------------------------------------------------------------
/// @brief Create a render pass to record render commands into.
///
Expand Down Expand Up @@ -102,6 +107,8 @@ class CommandBuffer {

[[nodiscard]] virtual bool OnSubmitCommands(CompletionCallback callback) = 0;

virtual void OnWaitUntilScheduled() = 0;

virtual std::shared_ptr<ComputePass> OnCreateComputePass() const = 0;

private:
Expand Down
1 change: 1 addition & 0 deletions impeller/renderer/testing/mocks.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class MockCommandBuffer : public CommandBuffer {
MOCK_CONST_METHOD1(SetLabel, void(const std::string& label));
MOCK_CONST_METHOD0(OnCreateBlitPass, std::shared_ptr<BlitPass>());
MOCK_METHOD1(OnSubmitCommands, bool(CompletionCallback callback));
MOCK_METHOD0(OnWaitUntilScheduled, void());
MOCK_CONST_METHOD0(OnCreateComputePass, std::shared_ptr<ComputePass>());
MOCK_METHOD1(OnCreateRenderPass,
std::shared_ptr<RenderPass>(RenderTarget render_target));
Expand Down
1 change: 1 addition & 0 deletions lib/ui/painting/image_decoder_impeller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ sk_sp<DlImage> ImageDecoderImpeller::UploadTextureToShared(
FML_DLOG(ERROR) << "Failed to submit blit pass command buffer.";
return nullptr;
}
command_buffer->WaitUntilScheduled();
}

return impeller::DlImageImpeller::Make(std::move(texture));
Expand Down