firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Impeller] Fix cmd pool reset from background thread. (flutter/engine#47184)

Browse Source 
Make sure to clear the buffers before assigning to the recycler, as the dtor was racing with the raster thread usage.
This commit is contained in:
Jonah Williams
2023-10-20 17:19:24 -07:00
committed by GitHub
parent a6be8601ec
commit afe55da595
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
engine/src/flutter/impeller/renderer/backend/vulkan/command_pool_vk.cc
View File

@@ -40,6 +40,7 @@ class BackgroundCommandPoolVK final {
if (!recycler) {
return;
}
buffers_.clear();
recycler->Reclaim(std::move(pool_));
}
@@ -56,8 +57,6 @@ class BackgroundCommandPoolVK final {
std::weak_ptr<CommandPoolRecyclerVK> recycler_;
};
static bool kResetOnBackgroundThread = false;
CommandPoolVK::~CommandPoolVK() {
if (!pool_) {
return;
@@ -75,10 +74,8 @@ CommandPoolVK::~CommandPoolVK() {
auto reset_pool_when_dropped = BackgroundCommandPoolVK(
std::move(pool_), std::move(collected_buffers_), recycler);
if (kResetOnBackgroundThread) {
UniqueResourceVKT<BackgroundCommandPoolVK> pool(
context->GetResourceManager(), std::move(reset_pool_when_dropped));
}
UniqueResourceVKT<BackgroundCommandPoolVK> pool(
context->GetResourceManager(), std::move(reset_pool_when_dropped));
}
// TODO(matanlurey): Return a status_or<> instead of {} when we have one.