Skip to content

[Stride] Remove duplicate shader pins and handle multiple pins with the same name #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tebjan wants to merge 3 commits into
base: main
Choose a base branch
from
+77 −2
Draft

[Stride] Remove duplicate shader pins and handle multiple pins with the same name #698

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c549cb
WIP: Removes duplicate shader pins
tebjan May 23, 2025
724eb3b
Keeps multiple pins oif the same pin name occurs in multiple base sha…
tebjan May 23, 2025
99a36c9
Some more clarity
tebjan May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 77 additions & 2 deletions VL.Stride.Runtime/src/Rendering/Effects/EffectShaderNodes.ShaderFX.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ static IVLNodeDescription NewShaderFXNode(this IVLNodeDescriptionFactory factory
init: buildContext =>
{
var outputType = shaderMetadata.GetShaderFXOutputType(out var innerType);
var (_effect, _messages, _) =
CreateEffectInstance("ShaderFXEffect", shaderName, shaderMetadata, serviceRegistry, graphicsDevice);
var (_effect, _messages, _)
= CreateEffectInstance("ShaderFXEffect", shaderName, shaderMetadata, serviceRegistry, graphicsDevice);

var _inputs = new List<IVLPinDescription>();
var _outputs = new List<IVLPinDescription>() { buildContext.Pin("Output", outputType) };
Expand Down Expand Up @@ -72,6 +72,81 @@ static IVLNodeDescription NewShaderFXNode(this IVLNodeDescriptionFactory factory
if (needsWorld)
_inputs.Add(new ParameterPinDescription(usedNames, TransformationKeys.World));

// Build set of variable names with 'stage' qualifier
var stageVariableNames = new HashSet<string>();
if (shaderMetadata.ParsedShader != null)
{
foreach (var v in shaderMetadata.ParsedShader.Variables)
{
if (v.Qualifiers != null && v.Qualifiers.Contains(Stride.Core.Shaders.Ast.Stride.StrideStorageQualifier.Stage))
stageVariableNames.Add(v.Name.Text);
}
}

// Group pins by variable name
var pinsByVarName = new Dictionary<string, List<ParameterPinDescription>>();
foreach (var input in _inputs)
{
if (input is ParameterPinDescription paramDesc)
{
var varName = paramDesc.Key.GetVariableName();
if (!pinsByVarName.TryGetValue(varName, out var list))
pinsByVarName[varName] = list = new List<ParameterPinDescription>();
list.Add(paramDesc);
}
}

// Set pin names: simple if unique, long if ambiguous
foreach (var pair in pinsByVarName)
{
var list = pair.Value;
if (list.Count == 1)
{
// Use simple name
list[0].Name = pair.Key;
}
else
{
// Use long name (already set by default)
// Optionally, could forcefully set to paramDesc.Key.Name for clarity
foreach (var pin in list)
pin.Name = pin.Key.Name;
}
}

// Deduplicate _inputs (with stage variable logic)
var uniqueInputs = new Dictionary<string, IVLPinDescription>();
var stagePins = new HashSet<string>();
foreach (var input in _inputs)
{
if (input is ParameterPinDescription paramDesc)
{
var keyName = paramDesc.Key.Name;
var varName = paramDesc.Key.GetVariableName();
if (stageVariableNames.Contains(varName))
{
// Only keep one pin for this stage variable
if (!stagePins.Contains(varName))
{
uniqueInputs["stage:" + varName] = paramDesc;
stagePins.Add(varName);
}
}
else
{
// Allow multiple pins for non-stage variables (by keyName)
// Prefer pins with longer names for better clarity and disambiguation in case of conflicts
if (!uniqueInputs.TryGetValue(keyName, out var existing) || (existing.Name.Length < paramDesc.Name.Length))
uniqueInputs[keyName] = paramDesc;
}
}
else
uniqueInputs[input.Name ?? input.GetType().FullName ?? Guid.NewGuid().ToString()] = input;
uniqueInputs[Guid.NewGuid().ToString()] = input;
}
}
_inputs = uniqueInputs.Values.ToList();

return buildContext.Node(
inputs: _inputs,
outputs: _outputs,
Expand Down