DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Impeller] Make ContextVK hash values globally unique (#171119)

Browse Source 
ContextVK had been using a thread-local counter to assign the value
returned by GetHash. But CommandPoolRecyclerVK was using these values as
keys in a process-wide global map.

If two engine instances using different task runner threads both created
a ContextVK, then the thread-local counter could cause both contexts to
share the same hash. So when
CommandPoolRecyclerVK::DestroyThreadLocalPools destroys the pools
associated with the first context's hash, it will also incorrectly
destroy the second context's pools.

Fixes https://github.com/flutter/flutter/issues/170141
This commit is contained in:
Jason Simmons 2025-06-25 15:20:14 -07:00 committed by GitHub
parent a39147c813
commit 89ba94902a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/src/flutter/impeller/renderer/backend/vulkan/context_vk.cc
View File

@ -119,11 +119,9 @@ size_t ContextVK::ChooseThreadCountForWorkers(size_t hardware_concurrency) {
}
namespace {
thread_local uint64_t tls_context_count = 0;
std::atomic_uint64_t context_count = 0;
uint64_t CalculateHash(void* ptr) {
// You could make a context once per nanosecond for 584 years on one thread
// before this overflows.
return ++tls_context_count;
return context_count.fetch_add(1);
}
} // namespace

16
engine/src/flutter/impeller/renderer/backend/vulkan/context_vk_unittests.cc
View File

@ -392,5 +392,21 @@ TEST(ContextVKTest, AHBSwapchainCapabilitiesCanBeMissing) {
} // namespace impeller
TEST(ContextVKTest, HashIsUniqueAcrossThreads) {
uint64_t hash1, hash2;
std::thread thread1([&]() {
auto context = MockVulkanContextBuilder().Build();
hash1 = context->GetHash();
});
std::thread thread2([&]() {
auto context = MockVulkanContextBuilder().Build();
hash2 = context->GetHash();
});
thread1.join();
thread2.join();
EXPECT_NE(hash1, hash2);
}
} // namespace testing
} // namespace impeller