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

Implement queries for D3D11 descriptor access

Browse Source 
* Since D3D11 is entirely non-bindless we can precalculate the descriptor access
  for a shader up-front from its reflection and combine at query time from the
  currently bound shaders. This effectively replaces the old bindpoint mapping.
This commit is contained in:
baldurk
2024-02-22 17:58:38 +00:00
parent 227842a295
commit c33807e95e
3 changed files with 106 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_replay.cpp
+17 -1
View File
@@ -1984,7 +1984,23 @@ rdcarray<SamplerDescriptor> D3D11Replay::GetSamplerDescriptors(ResourceId descri
rdcarray<DescriptorAccess> D3D11Replay::GetDescriptorAccess()
{
return {};
D3D11RenderState *rs = m_pDevice->GetImmediateContext()->GetCurrentPipelineState();
rdcarray<DescriptorAccess> ret;
const D3D11RenderState::Shader *srcArr[] = {&rs->VS, &rs->HS, &rs->DS, &rs->GS, &rs->PS, &rs->CS};
for(size_t stage = 0; stage < ARRAY_COUNT(srcArr); stage++)
{
const D3D11RenderState::Shader &src = *srcArr[stage];
WrappedShader *shad = (WrappedShader *)(WrappedID3D11Shader<ID3D11VertexShader> *)src.Object;
if(shad)
ret.append(shad->GetDescriptorAccess());
}
return ret;
}
RDResult D3D11Replay::ReadLogInitialisation(RDCFile *rdc, bool storeStructuredBuffers)
renderdoc/driver/d3d11/d3d11_resources.cpp
+73
View File
@@ -77,6 +77,16 @@ const GUID RENDERDOC_DeleteSelf = {
{0x91, 0x8a, 0xd6, 0x64, 0x56, 0x7c, 0xdd, 0x40},
};
WrappedShader::ShaderEntry::ShaderEntry(WrappedID3D11Device *device, ResourceId id,
const byte *code, size_t codeLen)
{
m_ID = id;
m_Bytecode.assign(code, codeLen);
m_DXBCFile = NULL;
m_Details = new ShaderReflection;
m_DescriptorStore = device->GetImmediateContext()->GetDescriptorsID();
}
void WrappedShader::ShaderEntry::BuildReflection()
{
RDCCOMPILE_ASSERT(
@@ -85,6 +95,69 @@ void WrappedShader::ShaderEntry::BuildReflection()
MakeShaderReflection(m_DXBCFile, m_Details, &m_Mapping);
m_Details->resourceId = m_ID;
DescriptorAccess access;
access.descriptorStore = m_DescriptorStore;
access.stage = m_Details->stage;
access.byteSize = 1;
m_Access.reserve(m_Mapping.constantBlocks.size() + m_Mapping.samplers.size() +
m_Mapping.readOnlyResources.size() + m_Mapping.readWriteResources.size());
RDCASSERT(m_Mapping.constantBlocks.size() < 0xffff, m_Mapping.constantBlocks.size());
for(uint16_t i = 0; i < m_Mapping.constantBlocks.size(); i++)
{
access.staticallyUnused = !m_Mapping.constantBlocks[i].used;
access.type = DescriptorType::ConstantBuffer;
access.index = i;
access.byteOffset = EncodeD3D11DescriptorIndex(
{access.stage, D3D11DescriptorMapping::CBs, (uint32_t)m_Mapping.constantBlocks[i].bind});
m_Access.push_back(access);
}
RDCASSERT(m_Mapping.samplers.size() < 0xffff, m_Mapping.samplers.size());
for(uint16_t i = 0; i < m_Mapping.samplers.size(); i++)
{
access.staticallyUnused = !m_Mapping.samplers[i].used;
access.type = DescriptorType::Sampler;
access.index = i;
access.byteOffset = EncodeD3D11DescriptorIndex(
{access.stage, D3D11DescriptorMapping::Samplers, (uint32_t)m_Mapping.samplers[i].bind});
m_Access.push_back(access);
}
RDCASSERT(m_Mapping.readOnlyResources.size() < 0xffff, m_Mapping.readOnlyResources.size());
for(uint16_t i = 0; i < m_Mapping.readOnlyResources.size(); i++)
{
access.staticallyUnused = !m_Mapping.readOnlyResources[i].used;
access.type = DescriptorType::Image;
if(!m_Details->readOnlyResources[i].isTexture)
access.type = (m_Details->readOnlyResources[i].variableType.baseType == VarType::UByte ||
!m_Details->readOnlyResources[i].variableType.members.empty())
? DescriptorType::Buffer
: DescriptorType::TypedBuffer;
access.index = i;
access.byteOffset = EncodeD3D11DescriptorIndex({access.stage, D3D11DescriptorMapping::SRVs,
(uint32_t)m_Mapping.readOnlyResources[i].bind});
m_Access.push_back(access);
}
RDCASSERT(m_Mapping.readWriteResources.size() < 0xffff, m_Mapping.readWriteResources.size());
for(uint16_t i = 0; i < m_Mapping.readWriteResources.size(); i++)
{
access.staticallyUnused = !m_Mapping.readWriteResources[i].used;
access.type = DescriptorType::ReadWriteImage;
if(!m_Details->readWriteResources[i].isTexture)
access.type = (m_Details->readWriteResources[i].variableType.baseType == VarType::UByte ||
!m_Details->readWriteResources[i].variableType.members.empty())
? DescriptorType::ReadWriteBuffer
: DescriptorType::ReadWriteTypedBuffer;
access.index = i;
access.byteOffset = EncodeD3D11DescriptorIndex({access.stage, D3D11DescriptorMapping::UAVs,
(uint32_t)m_Mapping.readWriteResources[i].bind});
m_Access.push_back(access);
}
}
UINT GetSubresourceCount(ID3D11Resource *res)
renderdoc/driver/d3d11/d3d11_resources.h
+16 -7
View File
@@ -978,13 +978,7 @@ public:
{
public:
ShaderEntry() : m_DXBCFile(NULL) {}
ShaderEntry(WrappedID3D11Device *device, ResourceId id, const byte *code, size_t codeLen)
{
m_ID = id;
m_Bytecode.assign(code, codeLen);
m_DXBCFile = NULL;
m_Details = new ShaderReflection;
}
ShaderEntry(WrappedID3D11Device *device, ResourceId id, const byte *code, size_t codeLen);
~ShaderEntry()
{
m_Bytecode.clear();
@@ -1024,6 +1018,14 @@ public:
return m_Mapping;
}
const rdcarray<DescriptorAccess> &GetDescriptorAccess()
{
if(!m_Built && GetDXBC() != NULL)
BuildReflection();
m_Built = true;
return m_Access;
}
private:
void TryReplaceOriginalByteCode();
@@ -1036,10 +1038,12 @@ public:
bytebuf m_Bytecode;
ResourceId m_DescriptorStore;
bool m_Built = false;
DXBC::DXBCContainer *m_DXBCFile;
ShaderReflection *m_Details;
ShaderBindpointMapping m_Mapping;
rdcarray<DescriptorAccess> m_Access;
friend class WrappedShader;
};
@@ -1094,6 +1098,11 @@ public:
SCOPED_LOCK(m_ShaderListLock);
return m_ShaderList[m_ID]->GetMapping();
}
const rdcarray<DescriptorAccess> &GetDescriptorAccess()
{
SCOPED_LOCK(m_ShaderListLock);
return m_ShaderList[m_ID]->GetDescriptorAccess();
}
static void GetReflections(rdcarray<ShaderReflection *> &refls)
{