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

Special case - manually backport "Don't select unused bindings..." to C#

Browse Source
This commit is contained in:
baldurk
2017-09-13 14:52:18 +01:00
parent 8617a7fad3
commit 9d54cf6b79
1 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Windows/PipelineState/VulkanPipelineStateViewer.cs
+33 -7
View File
@@ -381,6 +381,26 @@ namespace renderdocui.Windows.PipelineState
if (shaderDetails != null)
{
// we find the matching binding for this set/binding.
// The spec requires that there are no overlapping definitions, or if there are they have
// compatible types so we can just pick the first one we come across.
// The spec also doesn't require variables which are statically unused to have valid bindings,
// so they may be overlapping or possibly just defaulted to 0.
// Any variables with no binding declared at all were set to 0 and sorted to the end at
// reflection time, so we can just use a single algorithm to select the best candidate:
//
// 1. Search for matching bindset/bind resources. It doesn't matter which 'namespace' (sampler/
// read-only/read-write) we search in, because if there's a conflict the behaviour is
// illegal and if there's no conflict we won't get any ambiguity.
// 2. If we find a match, select it for use.
// 3. If we find a second match, use it in preference only if the old one was !used, and the new
// one is used.
//
// This will make us select the best possible option - the first declared used resource
// at a particular binding, ignoring any unused resources at that binding before/after. Or if
// 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.ReadOnlyResources.Length; i++)
{
var ro = shaderDetails.ReadOnlyResources[i];
@@ -388,9 +408,12 @@ namespace renderdocui.Windows.PipelineState
if (stage.BindpointMapping.ReadOnlyResources[ro.bindPoint].bindset == bindset &&
stage.BindpointMapping.ReadOnlyResources[ro.bindPoint].bind == bind)
{
bindPoint = (uint)i;
shaderRes = ro;
bindMap = stage.BindpointMapping.ReadOnlyResources[ro.bindPoint];
if (bindMap == null || (!bindMap.used && stage.BindpointMapping.ReadOnlyResources[ro.bindPoint].used))
{
bindPoint = (uint)i;
shaderRes = ro;
bindMap = stage.BindpointMapping.ReadOnlyResources[ro.bindPoint];
}
}
}
@@ -401,10 +424,13 @@ namespace renderdocui.Windows.PipelineState
if (stage.BindpointMapping.ReadWriteResources[rw.bindPoint].bindset == bindset &&
stage.BindpointMapping.ReadWriteResources[rw.bindPoint].bind == bind)
{
bindPoint = (uint)i;
isrw = true;
shaderRes = rw;
bindMap = stage.BindpointMapping.ReadWriteResources[rw.bindPoint];
if (bindMap == null || (!bindMap.used && stage.BindpointMapping.ReadWriteResources[rw.bindPoint].used))
{
bindPoint = (uint)i;
isrw = true;
shaderRes = rw;
bindMap = stage.BindpointMapping.ReadWriteResources[rw.bindPoint];
}
}
}
}