lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-24 07:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remap pipeline ID to live ID before calling driver

Browse Source
This commit is contained in:
baldurk
2019-10-10 19:00:16 +01:00
parent 2afd8fd887
commit 8259348707
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_replay.cpp
+1 -1
View File
@@ -518,7 +518,7 @@ std::string D3D12Replay::DisassembleShader(ResourceId pipeline, const ShaderRefl
}
WrappedID3D12PipelineState *pipe =
m_pDevice->GetResourceManager()->GetLiveAs<WrappedID3D12PipelineState>(pipeline);
m_pDevice->GetResourceManager()->GetCurrentAs<WrappedID3D12PipelineState>(pipeline);
UINT size = 0;
pipe->GetPrivateData(WKPDID_CommentStringW, &size, NULL);
renderdoc/driver/vulkan/vk_replay.cpp
+2 -2
View File
@@ -472,7 +472,7 @@ void VulkanReplay::CachePipelineExecutables(ResourceId pipeline)
rdcarray<PipelineExecutables> &data = it.first->second;
VkPipeline pipe = m_pDriver->GetResourceManager()->GetLiveHandle<VkPipeline>(pipeline);
VkPipeline pipe = m_pDriver->GetResourceManager()->GetCurrentHandle<VkPipeline>(pipeline);
VkPipelineInfoKHR pipeInfo = {
VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR, NULL, Unwrap(pipe),
@@ -566,7 +566,7 @@ std::string VulkanReplay::DisassembleShader(ResourceId pipeline, const ShaderRef
"; Shader must be disassembled with a specific pipeline.";
}
VkPipeline pipe = m_pDriver->GetResourceManager()->GetLiveHandle<VkPipeline>(pipeline);
VkPipeline pipe = m_pDriver->GetResourceManager()->GetCurrentHandle<VkPipeline>(pipeline);
VkShaderStageFlagBits stageBit =
VkShaderStageFlagBits(1 << it->second.GetReflection(refl->entryPoint, pipeline).stageIndex);
renderdoc/replay/replay_controller.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ rdcstr ReplayController::DisassembleShader(ResourceId pipeline, const ShaderRefl
if(t == target)
return GCNISA::Disassemble(refl->encoding, refl->stage, refl->rawBytes, target);
return m_pDevice->DisassembleShader(pipeline, refl, target);
return m_pDevice->DisassembleShader(m_pDevice->GetLiveID(pipeline), refl, target);
}
FrameDescription ReplayController::GetFrameInfo()