lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-20 21:46:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check samplers array for resources in descriptor sets too

Browse Source
This commit is contained in:
baldurk
2017-09-13 14:16:29 +01:00
parent cb644313db
commit 7259f9a04a
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+30 -3
View File
@@ -665,6 +665,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
QMap<ResourceId, SamplerData> &samplers)
{
const ShaderResource *shaderRes = NULL;
const ShaderSampler *shaderSamp = NULL;
const BindpointMap *bindMap = NULL;
bool isrw = false;
@@ -692,6 +693,24 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
// there's no used resource at all, the first declared unused resource (which will prefer
// resources with proper bindings over those without, as with the sorting mentioned above).
for(int i = 0; i < shaderDetails->Samplers.count; i++)
{
const ShaderSampler &s = shaderDetails->Samplers[i];
if(stage.BindpointMapping.Samplers[s.bindPoint].bindset == bindset &&
stage.BindpointMapping.Samplers[s.bindPoint].bind == bind)
{
// use this one either if we have no candidate, or the candidate we have is unused and this
// one is used
if(bindMap == NULL || (!bindMap->used && stage.BindpointMapping.Samplers[s.bindPoint].used))
{
bindPoint = (uint)i;
shaderSamp = &s;
bindMap = &stage.BindpointMapping.Samplers[s.bindPoint];
}
}
}
for(int i = 0; i < shaderDetails->ReadOnlyResources.count; i++)
{
const ShaderResource &ro = shaderDetails->ReadOnlyResources[i];
@@ -706,6 +725,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
{
bindPoint = (uint)i;
shaderRes = &ro;
shaderSamp = NULL;
bindMap = &stage.BindpointMapping.ReadOnlyResources[ro.bindPoint];
}
}
@@ -726,6 +746,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
bindPoint = (uint)i;
isrw = true;
shaderRes = &rw;
shaderSamp = NULL;
bindMap = &stage.BindpointMapping.ReadWriteResources[rw.bindPoint];
}
}
@@ -744,7 +765,9 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
}
else
{
if(shaderRes->resType == TextureDim::Buffer)
if(shaderSamp)
bindType = BindType::Sampler;
else if(shaderRes->resType == TextureDim::Buffer)
bindType = isrw ? BindType::ReadWriteBuffer : BindType::ReadOnlyBuffer;
else
bindType = isrw ? BindType::ReadWriteImage : BindType::ReadOnlyImage;
@@ -782,8 +805,10 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
QString setname = QString::number(bindset);
QString slotname = QString::number(bind);
if(shaderRes != NULL && shaderRes->name.count > 0)
if(shaderRes && shaderRes->name.count > 0)
slotname += lit(": ") + shaderRes->name;
else if(shaderSamp && shaderSamp->name.count > 0)
slotname += lit(": ") + shaderSamp->name;
int arrayLength = 0;
if(slotBinds != NULL)
@@ -819,8 +844,10 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
if(arrayLength > 1)
{
if(shaderRes != NULL && shaderRes->name.count > 0)
if(shaderRes && shaderRes->name.count > 0)
slotname = QFormatStr("%1[%2]: %3").arg(bind).arg(idx).arg(shaderRes->name);
else if(shaderSamp && shaderSamp->name.count > 0)
slotname = QFormatStr("%1[%2]: %3").arg(bind).arg(idx).arg(shaderSamp->name);
else
slotname = QFormatStr("%1[%2]").arg(bind).arg(idx);
}