lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-14 01:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set compute root signature elements to compute, not graphics

Browse Source
This commit is contained in:
baldurk
2016-09-19 18:31:21 +02:00
parent c5fb06bbca
commit 0bb42a0629
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_state.cpp
+2 -2
View File
@@ -152,7 +152,7 @@ void D3D12RenderState::ApplyState(ID3D12GraphicsCommandList *cmd)
GetResourceManager()->GetCurrentAs<ID3D12RootSignature>(graphics.rootsig));
for(size_t i = 0; i < graphics.sigelems.size(); i++)
graphics.sigelems[i].SetToCommandList(GetResourceManager(), cmd, (UINT)i);
graphics.sigelems[i].SetToGraphics(GetResourceManager(), cmd, (UINT)i);
}
if(compute.rootsig != ResourceId())
@@ -161,6 +161,6 @@ void D3D12RenderState::ApplyState(ID3D12GraphicsCommandList *cmd)
GetResourceManager()->GetCurrentAs<ID3D12RootSignature>(compute.rootsig));
for(size_t i = 0; i < compute.sigelems.size(); i++)
compute.sigelems[i].SetToCommandList(GetResourceManager(), cmd, (UINT)i);
compute.sigelems[i].SetToCompute(GetResourceManager(), cmd, (UINT)i);
}
}
renderdoc/driver/d3d12/d3d12_state.h
+37 -2
View File
@@ -60,7 +60,8 @@ struct D3D12RenderState
SignatureElement(SignatureElementType t, ResourceId i, UINT64 o) : type(t), id(i), offset(o) {}
SignatureElement(UINT offs, UINT val) : type(eRootConst), offset(offs)
{
constants.push_back(val);
type = eRootConst;
SetValues(1, &val, offs);
}
SignatureElement(UINT numVals, const void *vals, UINT offs)
{
@@ -76,7 +77,7 @@ struct D3D12RenderState
memcpy(&constants[offs], vals, numVals * sizeof(UINT));
}
void SetToCommandList(D3D12ResourceManager *rm, ID3D12GraphicsCommandList *cmd, UINT slot)
void SetToGraphics(D3D12ResourceManager *rm, ID3D12GraphicsCommandList *cmd, UINT slot)
{
if(type == eRootConst)
{
@@ -113,6 +114,40 @@ struct D3D12RenderState
}
}
void SetToCompute(D3D12ResourceManager *rm, ID3D12GraphicsCommandList *cmd, UINT slot)
{
if(type == eRootConst)
{
cmd->SetComputeRoot32BitConstants(slot, (UINT)constants.size(), &constants[0], 0);
}
else if(type == eRootTable)
{
D3D12_GPU_DESCRIPTOR_HANDLE handle =
rm->GetCurrentAs<ID3D12DescriptorHeap>(id)->GetGPUDescriptorHandleForHeapStart();
handle.ptr += sizeof(D3D12Descriptor) * offset;
cmd->SetComputeRootDescriptorTable(slot, handle);
}
else if(type == eRootCBV)
{
ID3D12Resource *res = rm->GetCurrentAs<ID3D12Resource>(id);
cmd->SetComputeRootConstantBufferView(slot, res->GetGPUVirtualAddress() + offset);
}
else if(type == eRootSRV)
{
ID3D12Resource *res = rm->GetCurrentAs<ID3D12Resource>(id);
cmd->SetComputeRootShaderResourceView(slot, res->GetGPUVirtualAddress() + offset);
}
else if(type == eRootUAV)
{
ID3D12Resource *res = rm->GetCurrentAs<ID3D12Resource>(id);
cmd->SetComputeRootUnorderedAccessView(slot, res->GetGPUVirtualAddress() + offset);
}
else
{
RDCWARN("Unexpected root signature element of type '%u' - skipping.", type);
}
}
SignatureElementType type;
ResourceId id;