Skip to content

Fixed some Shader Graph shaders fail to compile for Android XR #4806

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

Merged
merged 5 commits into from
Jul 6, 2021
Merged

Fixed some Shader Graph shaders fail to compile for Android XR #4806

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43b0324
* Fixed an issue where system generated semantics are placed before n…
thomas-zeng Jun 4, 2021
a19fc17
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
thomas-zeng Jun 4, 2021
bb08c6a
* Formatted the file.
thomas-zeng Jun 4, 2021
3774019
* Addressed some feedback - moving stereo output logic before cull fa…
thomas-zeng Jun 9, 2021
2a2afbe
* Addressed second round feedback.
thomas-zeng Jun 14, 2021
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
6 changes: 5 additions & 1 deletion com.unity.shadergraph/Editor/Generation/Processors/GenerationUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,14 @@ internal static void GeneratePackedStruct(StructDescriptor shaderStruct, ActiveF

if (fieldIsActive)
{
// special case, "UNITY_STEREO_INSTANCING_ENABLED" fields must be packed at the end of the struct because they are system generated semantics
//
if (subscript.HasPreprocessor() && (subscript.preprocessor.Contains("INSTANCING")))
postUnpackedSubscripts.Add(subscript);
// special case, "SHADER_STAGE_FRAGMENT" fields must be packed at the end of the struct,
// otherwise the vertex output struct will have different semantic ordering than the fragment input struct.
//
if (subscript.HasPreprocessor() && (subscript.preprocessor.Contains("SHADER_STAGE_FRAGMENT")))
else if (subscript.HasPreprocessor() && (subscript.preprocessor.Contains("SHADER_STAGE_FRAGMENT")))
postUnpackedSubscripts.Add(subscript);
else if (subscript.HasSemantic() || subscript.vectorCount == 0)
packedSubscripts.Add(subscript);
Expand Down