MergedKeywords and CommonParameters Supports in Shader #1316
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GZHYBFHHJ
changed the title
ds5678
requested changes
Apr 27, 2024
| @@ -0,0 +1,64 @@ | |||
| using AssetRipper.Export.Modules.Shaders.ShaderBlob.Parameters; | |||
| using AssetRipper.SourceGenerated.Extensions.Enums.Shader; | |||
| using YAML = AssetRipper.SourceGenerated.Subclasses; | |||
There was a problem hiding this comment.
Use a different name. Yaml has nothing to do with this.
| @@ -97,7 +97,7 @@ private static T[] CreateAndInitializeArray<T>(int length) where T : new() | |||
| } | |||
|
|
|||
|
|
|||
| public ShaderSubProgram GetSubProgram(uint blobIndex) | |||
| public ShaderSubProgram GetSubProgram(uint blobIndex, Action<ShaderSubProgram>? onRead) | |||
There was a problem hiding this comment.
This feels like an antipattern.
There was a problem hiding this comment.
I know this is not a good way
Should CommonParameter be passed as a parameter, or set a out parameter to check if SubProgram is from cache, or just clone the ShaderSubProgram?
There was a problem hiding this comment.
It feels like you're trying to process these values after reading them. I think we need 2 object models:
- A low level layer that adheres very closely to the binary content.
- A high level layer that includes processing where necessary.
Comment on lines
+104
to
+109
| List<string> keywords = reader.ReadStringArray().ToList(); // GlobalKeywords | ||
| if (HasLocalKeywords(unityVersion)) | ||
| { | ||
| LocalKeywords = reader.ReadStringArray(); | ||
| keywords.AddRange(reader.ReadStringArray()); | ||
| } | ||
| Keywords = keywords.ToArray(); |
There was a problem hiding this comment.
This is more efficient.
if (!HasLocalKeywords(unityVersion))
{
Keywords = reader.ReadStringArray();
}
else
{
string[] globalKeywords = reader.ReadStringArray();
string[] localKeywords = reader.ReadStringArray();
if (localKeywords.Length == 0)
{
Keywords = globalKeywords;
}
else if (globalKeywords.Length == 0)
{
Keywords = localKeywords;
}
else
{
Keywords = new string[globalKeywords.Length + localKeywords.Length];
globalKeywords.AsSpan().CopyTo(Keywords);
localKeywords.AsSpan().CopyTo(Keywords.AsSpan(globalKeywords.Length));
}
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #726