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

Fix unwrapping and replay of AddToStateObject

Browse Source
This commit is contained in:
baldurk
2024-05-16 15:47:55 +01:00
parent 4ba41dae23
commit 1019b7f2cb
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_device_wrap7.cpp
+9 -5
View File
@@ -77,7 +77,8 @@ bool WrappedID3D12Device::Serialise_AddToStateObject(SerialiserType &ser,
if(m_pDevice7)
{
hr = m_pDevice7->CreateStateObject(&Addition, guid, (void **)&ret);
hr = m_pDevice7->AddToStateObject(&Addition, Unwrap(pStateObjectToGrowFrom), guid,
(void **)&ret);
}
else
{
@@ -147,12 +148,13 @@ HRESULT STDMETHODCALLTYPE WrappedID3D12Device::AddToStateObject(
REFIID riid, _COM_Outptr_ void **ppNewStateObject)
{
if(pAddition == NULL)
return m_pDevice7->AddToStateObject(pAddition, pStateObjectToGrowFrom, riid, ppNewStateObject);
return m_pDevice7->AddToStateObject(pAddition, Unwrap(pStateObjectToGrowFrom), riid,
ppNewStateObject);
D3D12_UNWRAPPED_STATE_OBJECT_DESC unwrappedDesc(*pAddition);
if(ppNewStateObject == NULL)
return m_pDevice7->AddToStateObject(&unwrappedDesc, pStateObjectToGrowFrom, riid,
return m_pDevice7->AddToStateObject(&unwrappedDesc, Unwrap(pStateObjectToGrowFrom), riid,
ppNewStateObject);
if(riid != __uuidof(ID3D12StateObject))
@@ -160,8 +162,8 @@ HRESULT STDMETHODCALLTYPE WrappedID3D12Device::AddToStateObject(
ID3D12StateObject *real = NULL;
HRESULT ret;
SERIALISE_TIME_CALL(ret = m_pDevice7->AddToStateObject(&unwrappedDesc, pStateObjectToGrowFrom,
riid, (void **)&real));
SERIALISE_TIME_CALL(ret = m_pDevice7->AddToStateObject(
&unwrappedDesc, Unwrap(pStateObjectToGrowFrom), riid, (void **)&real));
if(SUCCEEDED(ret))
{
@@ -215,6 +217,8 @@ HRESULT STDMETHODCALLTYPE WrappedID3D12Device::AddToStateObject(
}
}
record->AddParent(GetRecord(pStateObjectToGrowFrom));
if(vendorChunk)
record->AddChunk(vendorChunk);
record->AddChunk(scope.Get());