layers: Set up QUEUE_STATE when getting device queue
A previous change (https://github.com/KhronosGroup/
Vulkan-ValidationLayers/pull/3370)
makes state tracker only set up the queue state objects on
vkCreateDevice() instead of on each vkGetDeviceQueue() call.
However, this breaks some devices (e.g. goldfish-vulkan virtual
ICD which is used for Android and Fuchsia emulator) where it
could possibly return different queue handles on vkGetDeviceQueue().
In order to handle this case, state tracker should still try to
update the queue map on each vkGetDeviceQueue() call.
TEST: vkreadback (on Fuchsia emulator)
Change-Id: Ib7a3f3b9808b5a7067bbcf0d1d97f7d7869dfd84
diff --git a/layers/state_tracker.cpp b/layers/state_tracker.cpp
index b0693d5..4a881e1 100644
--- a/layers/state_tracker.cpp
+++ b/layers/state_tracker.cpp
@@ -1524,6 +1524,21 @@
}
}
+void ValidationStateTracker::RecordGetDeviceQueueState(uint32_t queue_family_index, VkDeviceQueueCreateFlags flags, VkQueue queue) {
+ if (Get<QUEUE_STATE>(queue) == nullptr) {
+ Add(std::make_shared<QUEUE_STATE>(queue, queue_family_index, flags));
+ }
+}
+
+void ValidationStateTracker::PostCallRecordGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex,
+ VkQueue *pQueue) {
+ RecordGetDeviceQueueState(queueFamilyIndex, {}, *pQueue);
+}
+
+void ValidationStateTracker::PostCallRecordGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue) {
+ RecordGetDeviceQueueState(pQueueInfo->queueFamilyIndex, pQueueInfo->flags, *pQueue);
+}
+
void ValidationStateTracker::PostCallRecordQueueWaitIdle(VkQueue queue, VkResult result) {
if (VK_SUCCESS != result) return;
QUEUE_STATE *queue_state = GetQueueState(queue);
diff --git a/layers/state_tracker.h b/layers/state_tracker.h
index 7fbcfba..f93b678 100644
--- a/layers/state_tracker.h
+++ b/layers/state_tracker.h
@@ -1,7 +1,7 @@
-/* Copyright (c) 2015-2021 The Khronos Group Inc.
- * Copyright (c) 2015-2021 Valve Corporation
- * Copyright (c) 2015-2021 LunarG, Inc.
- * Copyright (C) 2015-2021 Google Inc.
+/* Copyright (c) 2015-2022 The Khronos Group Inc.
+ * Copyright (c) 2015-2022 Valve Corporation
+ * Copyright (c) 2015-2022 LunarG, Inc.
+ * Copyright (C) 2015-2022 Google Inc.
* Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -574,6 +574,8 @@
VkMemoryRequirements2* pMemoryRequirements) override;
void PostCallRecordGetBufferMemoryRequirements2KHR(VkDevice device, const VkBufferMemoryRequirementsInfo2* pInfo,
VkMemoryRequirements2* pMemoryRequirements) override;
+ void PostCallRecordGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue) override;
+ void PostCallRecordGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2* pQueueInfo, VkQueue* pQueue) override;
void PostCallRecordGetFenceFdKHR(VkDevice device, const VkFenceGetFdInfoKHR* pGetFdInfo, int* pFd, VkResult result) override;
void PostCallRecordGetFenceStatus(VkDevice device, VkFence fence, VkResult result) override;
#ifdef VK_USE_PLATFORM_WIN32_KHR
@@ -1192,6 +1194,7 @@
uint32_t queueFamilyIndex, uint32_t* pCounterCount,
VkPerformanceCounterKHR* pCounters);
void RecordGetBufferMemoryRequirementsState(VkBuffer buffer);
+ void RecordGetDeviceQueueState(uint32_t queue_family_index, VkDeviceQueueCreateFlags flags, VkQueue queue);
void RecordGetExternalFenceState(VkFence fence, VkExternalFenceHandleTypeFlagBits handle_type);
void RecordGetImageMemoryRequirementsState(VkImage image, const VkImageMemoryRequirementsInfo2* pInfo);
void RecordImportSemaphoreState(VkSemaphore semaphore, VkExternalSemaphoreHandleTypeFlagBits handle_type,
