lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-24 02:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some cases that didn't remap queue family indices. Closes #2837

Browse Source
This commit is contained in:
baldurk
2023-02-02 10:58:49 +00:00
parent 7d05d545d2
commit a9affea030
5 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.h
+1
View File
@@ -1067,6 +1067,7 @@ public:
return it->second.state;
}
uint32_t RemapQueue(uint32_t q) { return m_QueueRemapping[q][0].family; }
static rdcstr GetChunkName(uint32_t idx);
VulkanResourceManager *GetResourceManager() { return m_ResourceManager; }
VulkanDebugManager *GetDebugManager() { return m_DebugManager; }
renderdoc/driver/vulkan/vk_manager.cpp
+2 -1
View File
@@ -338,7 +338,7 @@ void VulkanResourceManager::SerialiseImageStates(SerialiserType &ser,
ImageSubresourceStateForRange p;
p.range = st.subresourceRange;
p.range.sliceCount = imageLayouts.imageInfo.extent.depth;
p.state.oldQueueFamilyIndex = st.dstQueueFamilyIndex;
p.state.oldQueueFamilyIndex = m_Core->RemapQueue(st.dstQueueFamilyIndex);
p.state.newQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
p.state.oldLayout = st.newLayout;
p.state.newLayout = imageState.GetImageInfo().initialLayout;
@@ -372,6 +372,7 @@ void VulkanResourceManager::SerialiseImageStates(SerialiserType &ser,
// initial state to the state it was in at the beginning of the capture.
ImageSubresourceState &state = it->state();
state.newLayout = imageState.GetImageInfo().initialLayout;
state.oldQueueFamilyIndex = m_Core->RemapQueue(state.oldQueueFamilyIndex);
state.newQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
}
}
renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+8
View File
@@ -1526,6 +1526,14 @@ bool WrappedVulkan::Serialise_vkCreateQueryPool(SerialiserType &ser, VkDevice de
{
VkQueryPool pool = VK_NULL_HANDLE;
VkQueryPoolPerformanceCreateInfoKHR *perfInfo =
(VkQueryPoolPerformanceCreateInfoKHR *)FindNextStruct(
&CreateInfo, VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR);
if(perfInfo)
{
perfInfo->queueFamilyIndex = m_QueueRemapping[perfInfo->queueFamilyIndex][0].family;
}
VkResult ret = ObjDisp(device)->CreateQueryPool(Unwrap(device), &CreateInfo, NULL, &pool);
if(ret != VK_SUCCESS)
renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+2 -2
View File
@@ -1627,7 +1627,7 @@ bool WrappedVulkan::Serialise_vkCreateBuffer(SerialiserType &ser, VkDevice devic
CreateInfo.usage |= VK_BUFFER_USAGE_TRANSFER_DST_BIT;
// remap the queue family indices
if(CreateInfo.sharingMode == VK_SHARING_MODE_EXCLUSIVE)
if(CreateInfo.sharingMode == VK_SHARING_MODE_CONCURRENT)
{
uint32_t *queueFamiles = (uint32_t *)CreateInfo.pQueueFamilyIndices;
for(uint32_t q = 0; q < CreateInfo.queueFamilyIndexCount; q++)
@@ -2030,7 +2030,7 @@ bool WrappedVulkan::Serialise_vkCreateImage(SerialiserType &ser, VkDevice device
CreateInfo.usage &= ~VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT;
// remap the queue family indices
if(CreateInfo.sharingMode == VK_SHARING_MODE_EXCLUSIVE)
if(CreateInfo.sharingMode == VK_SHARING_MODE_CONCURRENT)
{
uint32_t *queueFamiles = (uint32_t *)CreateInfo.pQueueFamilyIndices;
for(uint32_t q = 0; q < CreateInfo.queueFamilyIndexCount; q++)
renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp
+7
View File
@@ -391,6 +391,13 @@ bool WrappedVulkan::Serialise_vkCreateSwapchainKHR(SerialiserType &ser, VkDevice
VK_IMAGE_LAYOUT_UNDEFINED,
};
if(CreateInfo.imageSharingMode == VK_SHARING_MODE_CONCURRENT)
{
uint32_t *queueFamiles = (uint32_t *)CreateInfo.pQueueFamilyIndices;
for(uint32_t q = 0; q < CreateInfo.queueFamilyIndexCount; q++)
queueFamiles[q] = m_QueueRemapping[queueFamiles[q]][0].family;
}
for(uint32_t i = 0; i < NumImages; i++)
{
VkDeviceMemory mem = VK_NULL_HANDLE;