aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--layers/core_validation.cpp2
-rw-r--r--layers/core_validation.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 1ebd4a51..7dbbd343 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -4841,6 +4841,7 @@ VKAPI_ATTR void VKAPI_CALL GetDeviceQueue(VkDevice device, uint32_t queueFamilyI
auto result = dev_data->queues.emplace(*pQueue);
if (result.second == true) {
QUEUE_NODE *pQNode = &dev_data->queueMap[*pQueue];
+ pQNode->queue = *pQueue;
pQNode->device = device;
}
}
@@ -5593,6 +5594,7 @@ CreateFence(VkDevice device, const VkFenceCreateInfo *pCreateInfo, const VkAlloc
if (VK_SUCCESS == result) {
std::lock_guard<std::mutex> lock(global_lock);
auto &fence_node = dev_data->fenceMap[*pFence];
+ fence_node.fence = *pFence;
fence_node.createInfo = *pCreateInfo;
fence_node.needsSignaled = true;
if (pCreateInfo->flags & VK_FENCE_CREATE_SIGNALED_BIT) {
diff --git a/layers/core_validation.h b/layers/core_validation.h
index 00420e48..26c3edc9 100644
--- a/layers/core_validation.h
+++ b/layers/core_validation.h
@@ -212,6 +212,7 @@ class FENCE_NODE : public BASE_NODE {
public:
using BASE_NODE::in_use;
+ VkFence fence;
VkSwapchainKHR swapchain; // Swapchain that this fence is submitted against or NULL
bool firstTimeFlag; // Fence was created in signaled state, avoid warnings for first use
VkFenceCreateInfo createInfo;
@@ -241,6 +242,7 @@ class EVENT_NODE : public BASE_NODE {
class QUEUE_NODE {
public:
+ VkQueue queue;
VkDevice device;
std::vector<VkFence> lastFences;
#if MTMERGE