Merge "Add GUARDED_BY annotations to physical device and devices maps" into main am: cb942fcdec
Original change: https://android-review.googlesource.com/c/platform/hardware/google/gfxstream/+/3502419
Change-Id: Ic49ae7e6b83421fb54ffbe2200e87864200604a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
GitOrigin-RevId: a7b28b3f23e6e95b3b2e7f50b6251f496855611e
diff --git a/host/vulkan/VkDecoderGlobalState.cpp b/host/vulkan/VkDecoderGlobalState.cpp
index ddf5ca4..2119373 100644
--- a/host/vulkan/VkDecoderGlobalState.cpp
+++ b/host/vulkan/VkDecoderGlobalState.cpp
@@ -9162,7 +9162,7 @@
}
// Returns the VkInstance associated with a VkDevice, or null if it's not found
- VkInstance* deviceToInstanceLocked(VkDevice device) {
+ VkInstance* deviceToInstanceLocked(VkDevice device) REQUIRES(mMutex) {
auto* physicalDevice = android::base::find(mDeviceToPhysicalDevice, device);
if (!physicalDevice) return nullptr;
return android::base::find(mPhysicalDeviceToInstance, *physicalDevice);
@@ -9281,8 +9281,8 @@
// Back-reference to the physical device associated with a particular
// VkDevice, and the VkDevice corresponding to a VkQueue.
- std::unordered_map<VkDevice, VkPhysicalDevice> mDeviceToPhysicalDevice;
- std::unordered_map<VkPhysicalDevice, VkInstance> mPhysicalDeviceToInstance;
+ std::unordered_map<VkDevice, VkPhysicalDevice> mDeviceToPhysicalDevice GUARDED_BY(mMutex);
+ std::unordered_map<VkPhysicalDevice, VkInstance> mPhysicalDeviceToInstance GUARDED_BY(mMutex);
// Device objects
std::unordered_map<VkBuffer, BufferInfo> mBufferInfo GUARDED_BY(mMutex);
