use device from QueueInfo or as passed in

LunarG · Oct 22, 2024 · 28ed423 · 28ed423
1 parent dcd6a4d
commit 28ed423
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/framework/decode/vulkan_captured_swapchain.cpp b/framework/decode/vulkan_captured_swapchain.cpp
@@ -43,7 +43,6 @@ VkResult VulkanCapturedSwapchain::CreateSwapchainKHR(VkResult
         device = device_info->handle;
     }
     device_table_         = device_table;
-    device_               = device;
     auto replay_swapchain = swapchain->GetHandlePointer();
     return func(device, create_info, allocator, replay_swapchain);
 }

diff --git a/framework/decode/vulkan_object_info.h b/framework/decode/vulkan_object_info.h
@@ -314,6 +314,7 @@ struct DeviceInfo : public VulkanObjectInfo<VkDevice>
 
 struct QueueInfo : public VulkanObjectInfo<VkQueue>
 {
+    VkDevice                             device;
     std::unordered_map<uint32_t, size_t> array_counts;
     uint32_t                             family_index;
     uint32_t                             queue_index;

diff --git a/framework/decode/vulkan_offscreen_swapchain.cpp b/framework/decode/vulkan_offscreen_swapchain.cpp
@@ -94,8 +94,6 @@ VkResult VulkanOffscreenSwapchain::CreateSwapchainKHR(VkResult
     VkSwapchainKHR*         replay_swapchain = swapchain->GetHandlePointer();
     VkDevice                device           = device_info->handle;
 
-    device_ = device;
-
     // Give swapchain a fake handle. It's handle id.
     *replay_swapchain = UINT64_TO_VK_HANDLE(VkSwapchainKHR, *id);
     if (!AddSwapchainResourceData(*replay_swapchain))

diff --git a/framework/decode/vulkan_replay_consumer_base.cpp b/framework/decode/vulkan_replay_consumer_base.cpp
@@ -3015,6 +3015,7 @@ void VulkanReplayConsumerBase::OverrideGetDeviceQueue(PFN_vkGetDeviceQueue
     // This is necessary for the virtual swapchain to determine which command buffer to use when
     // Bliting the images on the Presenting Queue.
     auto queue_info          = reinterpret_cast<QueueInfo*>(pQueue->GetConsumerData(0));
+    queue_info->device = device;
     queue_info->family_index = queueFamilyIndex;
     queue_info->queue_index  = queueIndex;
 }
@@ -3038,6 +3039,7 @@ void VulkanReplayConsumerBase::OverrideGetDeviceQueue2(PFN_vkGetDeviceQueue2
     // This is necessary for the virtual swapchain to determine which command buffer to use when
     // Bliting the images on the Presenting Queue.
     auto queue_info          = reinterpret_cast<QueueInfo*>(pQueue->GetConsumerData(0));
+    queue_info->device = device;
     queue_info->family_index = in_pQueueInfo->queueFamilyIndex;
     queue_info->queue_index  = in_pQueueInfo->queueIndex;
 }

diff --git a/framework/decode/vulkan_swapchain.h b/framework/decode/vulkan_swapchain.h
@@ -179,8 +179,6 @@ class VulkanSwapchain
     const encode::VulkanInstanceTable* instance_table_{ nullptr };
     const encode::VulkanDeviceTable*   device_table_{ nullptr };
 
-    VkDevice device_{ VK_NULL_HANDLE };
-
     application::Application* application_{ nullptr };
     ActiveWindows             active_windows_;
     int32_t                   create_surface_count_{ 0 };

diff --git a/framework/decode/vulkan_virtual_swapchain.cpp b/framework/decode/vulkan_virtual_swapchain.cpp
@@ -58,7 +58,6 @@ VkResult VulkanVirtualSwapchain::CreateSwapchainKHR(VkResult
         device = device_info->handle;
     }
     device_table_                    = device_table;
-    device_                          = device;
     VkPhysicalDevice physical_device = device_info->parent;
 
     VkSwapchainCreateInfoKHR modified_create_info = *create_info;
@@ -463,12 +462,12 @@ VkResult VulkanVirtualSwapchain::CreateSwapchainResourceData(const DeviceInfo*
             auto command_buffer = swapchain_resources->copy_cmd_data[copy_queue_family_index].command_buffers[0];
             auto copy_fence     = swapchain_resources->copy_cmd_data[copy_queue_family_index].fences[0];
 
-            result = device_table_->WaitForFences(device_, 1, &copy_fence, VK_TRUE, ~0UL);
+            result = device_table_->WaitForFences(device, 1, &copy_fence, VK_TRUE, ~0UL);
             if (result != VK_SUCCESS)
             {
                 return result;
             }
-            result = device_table_->ResetFences(device_, 1, &copy_fence);
+            result = device_table_->ResetFences(device, 1, &copy_fence);
             if (result != VK_SUCCESS)
             {
                 return result;
@@ -714,6 +713,7 @@ VkResult VulkanVirtualSwapchain::QueuePresentKHR(VkResult
         return func(queue_info->handle, present_info);
     }
 
+    VkDevice device             = queue_info->device;
     VkQueue  queue              = queue_info->handle;
     uint32_t queue_family_index = queue_info->family_index;
 
@@ -831,12 +831,12 @@ VkResult VulkanVirtualSwapchain::QueuePresentKHR(VkResult
             present_wait_semaphores.emplace_back(copy_semaphore);
         }
 
-        result = device_table_->WaitForFences(device_, 1, &copy_fence, VK_TRUE, ~0UL);
+        result = device_table_->WaitForFences(device, 1, &copy_fence, VK_TRUE, ~0UL);
         if (result != VK_SUCCESS)
         {
             return result;
         }
-        result = device_table_->ResetFences(device_, 1, &copy_fence);
+        result = device_table_->ResetFences(device, 1, &copy_fence);
         if (result != VK_SUCCESS)
         {
             return result;