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

Check for live resources existing before translating to live ID.

Browse Source
This commit is contained in:
baldurk
2017-11-16 16:55:25 +00:00
parent 4a4089f316
commit 7d501f6ef5
5 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_replay.cpp
+2
View File
@@ -1328,6 +1328,8 @@ void D3D11Replay::InitPostVSBuffers(const vector<uint32_t> &passEvents)
ResourceId D3D11Replay::GetLiveID(ResourceId id)
{
if(!m_pDevice->GetResourceManager()->HasLiveResource(id))
return ResourceId();
return m_pDevice->GetResourceManager()->GetLiveID(id);
}
renderdoc/driver/d3d12/d3d12_replay.cpp
+2
View File
@@ -300,6 +300,8 @@ FrameRecord D3D12Replay::GetFrameRecord()
ResourceId D3D12Replay::GetLiveID(ResourceId id)
{
if(!m_pDevice->GetResourceManager()->HasLiveResource(id))
return ResourceId();
return m_pDevice->GetResourceManager()->GetLiveID(id);
}
renderdoc/driver/gl/gl_replay.cpp
+2
View File
@@ -130,6 +130,8 @@ FrameRecord GLReplay::GetFrameRecord()
ResourceId GLReplay::GetLiveID(ResourceId id)
{
if(!m_pDriver->GetResourceManager()->HasLiveResource(id))
return ResourceId();
return m_pDriver->GetResourceManager()->GetLiveID(id);
}
renderdoc/driver/vulkan/vk_replay.cpp
+2
View File
@@ -737,6 +737,8 @@ vector<uint32_t> VulkanReplay::GetPassEvents(uint32_t eventID)
ResourceId VulkanReplay::GetLiveID(ResourceId id)
{
if(!m_pDriver->GetResourceManager()->HasLiveResource(id))
return ResourceId();
return m_pDriver->GetResourceManager()->GetLiveID(id);
}
renderdoc/replay/replay_controller.cpp
+32 -6
View File
@@ -315,7 +315,10 @@ rdcarray<DebugMessage> ReplayController::GetDebugMessages()
rdcarray<EventUsage> ReplayController::GetUsage(ResourceId id)
{
return m_pDevice->GetUsage(m_pDevice->GetLiveID(id));
id = m_pDevice->GetLiveID(id);
if(id == ResourceId())
return rdcarray<EventUsage>();
return m_pDevice->GetUsage(id);
}
MeshFormat ReplayController::GetPostVSData(uint32_t instID, MeshDataStage stage)
@@ -373,6 +376,13 @@ bool ReplayController::SaveTexture(const TextureSave &saveData, const char *path
{
TextureSave sd = saveData; // mutable copy
ResourceId liveid = m_pDevice->GetLiveID(sd.id);
if(liveid == ResourceId())
{
RDCERR("Couldn't get Live ID for %llu getting texture data", sd.id);
return false;
}
TextureDescription td = m_pDevice->GetTexture(liveid);
bool success = false;
@@ -1211,7 +1221,12 @@ rdcarray<PixelModification> ReplayController::PixelHistory(ResourceId target, ui
}
}
auto usage = m_pDevice->GetUsage(m_pDevice->GetLiveID(target));
ResourceId id = m_pDevice->GetLiveID(target);
if(id == ResourceId())
return ret;
std::vector<EventUsage> usage = m_pDevice->GetUsage(id);
vector<EventUsage> events;
@@ -1276,8 +1291,12 @@ rdcarray<PixelModification> ReplayController::PixelHistory(ResourceId target, ui
return ret;
}
ret = m_pDevice->PixelHistory(events, m_pDevice->GetLiveID(target), x, y, slice, mip, sampleIdx,
typeHint);
id = m_pDevice->GetLiveID(target);
if(id == ResourceId())
return ret;
ret = m_pDevice->PixelHistory(events, id, x, y, slice, mip, sampleIdx, typeHint);
SetFrameEvent(m_EventID, true);
@@ -1329,11 +1348,18 @@ rdcarray<ShaderVariable> ReplayController::GetCBufferVariableContents(
{
vector<byte> data;
if(buffer != ResourceId())
m_pDevice->GetBufferData(m_pDevice->GetLiveID(buffer), offs, 0, data);
{
buffer = m_pDevice->GetLiveID(buffer);
if(buffer != ResourceId())
m_pDevice->GetBufferData(m_pDevice->GetLiveID(buffer), offs, 0, data);
}
vector<ShaderVariable> v;
m_pDevice->FillCBufferVariables(m_pDevice->GetLiveID(shader), entryPoint, cbufslot, v, data);
shader = m_pDevice->GetLiveID(shader);
if(shader != ResourceId())
m_pDevice->FillCBufferVariables(m_pDevice->GetLiveID(shader), entryPoint, cbufslot, v, data);
return v;
}