lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow-up fix for 840338140d, the same thing could happen on replay

Browse Source 
* This is fixed upstream in the loader, but only on master and people
  could be running 1.0.5 or 1.0.8 for a long time, so we can't afford
  to just leave it to the loader to fix
This commit is contained in:
baldurk
2016-04-18 12:10:38 +02:00
parent 2e439c0515
commit bbc75cc59d
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+17 -6
View File
@@ -322,6 +322,12 @@ bool WrappedVulkan::Serialise_vkEnumeratePhysicalDevices(
RDCASSERT(count > physIndex);
devices = new VkPhysicalDevice[count];
if(physIndex >= m_PhysicalDevices.size())
{
m_PhysicalDevices.resize(physIndex+1);
m_MemIdxMaps.resize(physIndex+1);
}
vkr = ObjDisp(instance)->EnumeratePhysicalDevices(Unwrap(instance), &count, devices);
RDCASSERTEQUAL(vkr, VK_SUCCESS);
@@ -329,16 +335,21 @@ bool WrappedVulkan::Serialise_vkEnumeratePhysicalDevices(
pd = devices[physIndex];
for(size_t i=0; i < m_PhysicalDevices.size(); i++)
{
// physical devices might be re-created inside EnumeratePhysicalDevices every time, so
// we need to re-wrap any previously enumerated physical devices
if(m_PhysicalDevices[i] != VK_NULL_HANDLE)
{
RDCASSERTNOTEQUAL(i, physIndex);
GetWrapped(m_PhysicalDevices[i])->RewrapObject(devices[i]);
}
}
SAFE_DELETE_ARRAY(devices);
GetResourceManager()->WrapResource(instance, pd);
GetResourceManager()->AddLiveResource(physId, pd);
if(physIndex >= m_PhysicalDevices.size())
{
m_PhysicalDevices.resize(physIndex+1);
m_MemIdxMaps.resize(physIndex+1);
}
m_PhysicalDevices[physIndex] = pd;