lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-08 06:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure ClearState() is serialised in D3D12 command lists

Browse Source
This commit is contained in:
baldurk
2019-12-11 15:38:02 +00:00
parent b15c0541f0
commit 6fa54ce342
4 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+63 -5
View File
@@ -447,11 +447,6 @@ HRESULT WrappedID3D12GraphicsCommandList::Reset(ID3D12CommandAllocator *pAllocat
return ret;
}
void WrappedID3D12GraphicsCommandList::ClearState(ID3D12PipelineState *pPipelineState)
{
m_pList->ClearState(Unwrap(pPipelineState));
}
template <typename SerialiserType>
bool WrappedID3D12GraphicsCommandList::Serialise_ResourceBarrier(
SerialiserType &ser, UINT NumBarriers, const D3D12_RESOURCE_BARRIER *pBarriers)
@@ -605,6 +600,67 @@ void WrappedID3D12GraphicsCommandList::ResourceBarrier(UINT NumBarriers,
#pragma region State Setting
template <typename SerialiserType>
bool WrappedID3D12GraphicsCommandList::Serialise_ClearState(SerialiserType &ser,
ID3D12PipelineState *pPipelineState)
{
ID3D12GraphicsCommandList *pCommandList = this;
SERIALISE_ELEMENT(pCommandList);
SERIALISE_ELEMENT(pPipelineState);
SERIALISE_CHECK_READ_ERRORS();
if(IsReplayingAndReading())
{
m_Cmd->m_LastCmdListID = GetResourceManager()->GetOriginalID(GetResID(pCommandList));
if(IsActiveReplaying(m_State))
{
if(m_Cmd->InRerecordRange(m_Cmd->m_LastCmdListID))
{
Unwrap(m_Cmd->RerecordCmdList(m_Cmd->m_LastCmdListID))->ClearState(Unwrap(pPipelineState));
if(m_Cmd->IsPartialCmdList(m_Cmd->m_LastCmdListID))
{
m_Cmd->m_RenderState = D3D12RenderState();
m_Cmd->m_RenderState.m_DebugManager = m_pDevice->GetDebugManager();
m_Cmd->m_RenderState.m_ResourceManager = m_pDevice->GetResourceManager();
m_Cmd->m_RenderState.pipe = GetResID(pPipelineState);
}
}
}
else
{
Unwrap(pCommandList)->ClearState(Unwrap(pPipelineState));
GetCrackedList()->ClearState(Unwrap(pPipelineState));
D3D12RenderState &state = m_Cmd->m_BakedCmdListInfo[m_Cmd->m_LastCmdListID].state;
state = D3D12RenderState();
state.m_DebugManager = m_pDevice->GetDebugManager();
state.m_ResourceManager = m_pDevice->GetResourceManager();
state.pipe = GetResID(pPipelineState);
}
}
return true;
}
void WrappedID3D12GraphicsCommandList::ClearState(ID3D12PipelineState *pPipelineState)
{
SERIALISE_TIME_CALL(m_pList->ClearState(Unwrap(pPipelineState)));
if(IsCaptureMode(m_State))
{
CACHE_THREAD_SERIALISER();
SCOPED_SERIALISE_CHUNK(D3D12Chunk::List_ClearState);
Serialise_ClearState(ser, pPipelineState);
m_ListRecord->AddChunk(scope.Get());
m_ListRecord->MarkResourceFrameReferenced(GetResID(pPipelineState), eFrameRef_Read);
}
}
template <typename SerialiserType>
bool WrappedID3D12GraphicsCommandList::Serialise_IASetPrimitiveTopology(
SerialiserType &ser, D3D12_PRIMITIVE_TOPOLOGY PrimitiveTopology)
@@ -5162,6 +5218,8 @@ INSTANTIATE_FUNCTION_SERIALISED(void, WrappedID3D12GraphicsCommandList, Reset,
ID3D12PipelineState *pInitialState);
INSTANTIATE_FUNCTION_SERIALISED(void, WrappedID3D12GraphicsCommandList, ResourceBarrier,
UINT NumBarriers, const D3D12_RESOURCE_BARRIER *pBarriers);
INSTANTIATE_FUNCTION_SERIALISED(void, WrappedID3D12GraphicsCommandList, ClearState,
ID3D12PipelineState *pPipelineState);
INSTANTIATE_FUNCTION_SERIALISED(void, WrappedID3D12GraphicsCommandList, IASetPrimitiveTopology,
D3D12_PRIMITIVE_TOPOLOGY PrimitiveTopology);
INSTANTIATE_FUNCTION_SERIALISED(void, WrappedID3D12GraphicsCommandList, RSSetViewports,
renderdoc/driver/d3d12/d3d12_commands.cpp
+2
View File
@@ -708,6 +708,8 @@ bool WrappedID3D12CommandQueue::ProcessChunk(ReadSerialiser &ser, D3D12Chunk chu
case D3D12Chunk::Swapchain_Present: ret = m_pDevice->Serialise_Present(ser, NULL, 0, 0); break;
case D3D12Chunk::List_ClearState: ret = m_ReplayList->Serialise_ClearState(ser, NULL); break;
default:
{
SystemChunk system = (SystemChunk)chunk;
renderdoc/driver/d3d12/d3d12_common.h
+1
View File
@@ -850,5 +850,6 @@ enum class D3D12Chunk : uint32_t
List_RSSetShadingRateImage,
Device_ExternalDXGIResource,
Swapchain_Present,
List_ClearState,
Max,
};
renderdoc/driver/d3d12/d3d12_stringise.cpp
+2 -1
View File
@@ -28,7 +28,7 @@
template <>
rdcstr DoStringise(const D3D12Chunk &el)
{
RDCCOMPILE_ASSERT((uint32_t)D3D12Chunk::Max == 1106, "Chunks changed without updating names");
RDCCOMPILE_ASSERT((uint32_t)D3D12Chunk::Max == 1107, "Chunks changed without updating names");
BEGIN_ENUM_STRINGISE(D3D12Chunk)
{
@@ -192,6 +192,7 @@ rdcstr DoStringise(const D3D12Chunk &el)
"ID3D12GraphicsCommandList5::RSSetShadingRateImage");
STRINGISE_ENUM_CLASS_NAMED(Device_ExternalDXGIResource, "External DXGI Resource import");
STRINGISE_ENUM_CLASS_NAMED(Swapchain_Present, "IDXGISwapChain::Present");
STRINGISE_ENUM_CLASS_NAMED(List_ClearState, "ID3D12GraphicsCommandList::ClearState");
STRINGISE_ENUM_CLASS_NAMED(Max, "Max Chunk");
}
END_ENUM_STRINGISE()