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

Rebase associations after patching state object desc

Browse Source
This commit is contained in:
baldurk
2024-04-30 17:02:08 +01:00
parent b06e7030a5
commit ffb9c6cb3b
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_device_wrap5.cpp
+21 -4
View File
@@ -177,6 +177,7 @@ HRESULT WrappedID3D12Device::CreateStateObject(const D3D12_STATE_OBJECT_DESC *pD
rdcarray<ID3D12RootSignature *> rootsigs;
rdcarray<ID3D12StateObject *> collections;
size_t numAssocs = 0;
for(size_t i = 0; i < subobjects.size(); i++)
{
subobjects[i] = pDesc->pSubobjects[i];
@@ -192,12 +193,18 @@ HRESULT WrappedID3D12Device::CreateStateObject(const D3D12_STATE_OBJECT_DESC *pD
D3D12_EXISTING_COLLECTION_DESC *coll = (D3D12_EXISTING_COLLECTION_DESC *)subobjects[i].pDesc;
collections.push_back(coll->pExistingCollection);
}
else if(subobjects[i].Type == D3D12_STATE_SUBOBJECT_TYPE_SUBOBJECT_TO_EXPORTS_ASSOCIATION)
{
numAssocs++;
}
}
rdcarray<D3D12_GLOBAL_ROOT_SIGNATURE> rootsigObjs;
rdcarray<D3D12_GLOBAL_ROOT_SIGNATURE> unwrappedRootsigObjs;
rdcarray<D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATION> rebasedAssocs;
rdcarray<D3D12_EXISTING_COLLECTION_DESC> collObjs;
rootsigObjs.resize(rootsigs.size());
unwrappedRootsigObjs.resize(rootsigs.size());
collObjs.resize(collections.size());
rebasedAssocs.reserve(numAssocs);
for(size_t i = 0, r = 0, c = 0; i < subobjects.size(); i++)
{
@@ -205,8 +212,8 @@ HRESULT WrappedID3D12Device::CreateStateObject(const D3D12_STATE_OBJECT_DESC *pD
subobjects[i].Type == D3D12_STATE_SUBOBJECT_TYPE_LOCAL_ROOT_SIGNATURE)
{
D3D12_GLOBAL_ROOT_SIGNATURE *rootsig = (D3D12_GLOBAL_ROOT_SIGNATURE *)subobjects[i].pDesc;
rootsigObjs[r].pGlobalRootSignature = Unwrap(rootsig->pGlobalRootSignature);
subobjects[i].pDesc = &rootsigObjs[r++];
unwrappedRootsigObjs[r].pGlobalRootSignature = Unwrap(rootsig->pGlobalRootSignature);
subobjects[i].pDesc = &unwrappedRootsigObjs[r++];
}
else if(subobjects[i].Type == D3D12_STATE_SUBOBJECT_TYPE_EXISTING_COLLECTION)
{
@@ -214,6 +221,16 @@ HRESULT WrappedID3D12Device::CreateStateObject(const D3D12_STATE_OBJECT_DESC *pD
collObjs[c] = *coll;
collObjs[c].pExistingCollection = Unwrap(collObjs[c].pExistingCollection);
}
else if(subobjects[i].Type == D3D12_STATE_SUBOBJECT_TYPE_SUBOBJECT_TO_EXPORTS_ASSOCIATION)
{
D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATION assoc =
*(D3D12_SUBOBJECT_TO_EXPORTS_ASSOCIATION *)subobjects[i].pDesc;
size_t idx = assoc.pSubobjectToAssociate - pDesc->pSubobjects;
assoc.pSubobjectToAssociate = subobjects.data() + idx;
rebasedAssocs.push_back(assoc);
subobjects[i].pDesc = &rebasedAssocs.back();
}
}
unwrappedDesc.pSubobjects = subobjects.data();