[Port] [6000.0][UUM-87636] Fix sprite instancing with 2d shaders

Author: svc-reach-platform-support

Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Includes/SpriteLitPass.hlsl

@@ -25,6 +25,9 @@ half4 _RendererColor;
 PackedVaryings vert(Attributes input)
 {
     Varyings output = (Varyings)0;
+    UNITY_SETUP_INSTANCE_ID(input);
+
+    SetUpSpriteInstanceProperties();
     input.positionOS = UnityFlipSprite(input.positionOS, unity_SpriteProps.xy);
     output = BuildVaryings(input);
     output.color *= _RendererColor * unity_SpriteColor; // vertex color has to applied here

Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Includes/SpriteNormalPass.hlsl

@@ -5,6 +5,7 @@ PackedVaryings vert(Attributes input)
     Varyings output = (Varyings)0;
     input.positionOS = UnityFlipSprite(input.positionOS, unity_SpriteProps.xy);
     output = BuildVaryings(input);
+    output.color *= unity_SpriteColor;
     output.normalWS = -GetViewForwardDir();
     PackedVaryings packedOutput = PackVaryings(output);
     return packedOutput;

Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Includes/SpriteUnlitPass.hlsl

@@ -7,6 +7,9 @@ half4 _RendererColor;
 PackedVaryings vert(Attributes input)
 {
     Varyings output = (Varyings)0;
+    UNITY_SETUP_INSTANCE_ID(input);
+
+    SetUpSpriteInstanceProperties();
     input.positionOS = UnityFlipSprite(input.positionOS, unity_SpriteProps.xy);
     output = BuildVaryings(input);
     output.color *= _RendererColor * unity_SpriteColor; // vertex color has to applied here

Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs

@@ -21,13 +21,14 @@ public override void Setup(ref TargetSetupContext context)
         {
             base.Setup(ref context);
             context.AddAssetDependency(kSourceCodeGuid, AssetCollection.Flags.SourceDependency);
-#if HAS_VFX_GRAPH
+
             var universalRPType = typeof(UnityEngine.Rendering.Universal.UniversalRenderPipelineAsset);
-            if (TargetsVFX() && !context.HasCustomEditorForRenderPipeline(universalRPType))
-            {
-                context.AddCustomEditorForRenderPipeline(typeof(VFXGenericShaderGraphMaterialGUI).FullName, universalRPType);
-            }
+            var gui = typeof(ShaderGraphSpriteGUI);
+#if HAS_VFX_GRAPH
+            if (TargetsVFX())
+                gui = typeof(VFXGenericShaderGraphMaterialGUI);
 #endif
+            context.AddCustomEditorForRenderPipeline(gui.FullName, universalRPType);
             context.AddSubShader(PostProcessSubShader(SubShaders.SpriteLit(target)));
         }
 
@@ -244,6 +245,7 @@ static class SpriteLitRequiredFields
 
             public static FieldCollection Normal = new FieldCollection()
             {
+                StructFields.Varyings.color,
                 StructFields.Varyings.normalWS,
                 StructFields.Varyings.tangentWS,
             };

Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs

@@ -23,13 +23,14 @@ public override void Setup(ref TargetSetupContext context)
         {
             base.Setup(ref context);
             context.AddAssetDependency(kSourceCodeGuid, AssetCollection.Flags.SourceDependency);
-#if HAS_VFX_GRAPH
+
             var universalRPType = typeof(UnityEngine.Rendering.Universal.UniversalRenderPipelineAsset);
-            if (TargetsVFX() && !context.HasCustomEditorForRenderPipeline(universalRPType))
-            {
-                context.AddCustomEditorForRenderPipeline(typeof(VFXGenericShaderGraphMaterialGUI).FullName, universalRPType);
-            }
+            var gui = typeof(ShaderGraphSpriteGUI);
+#if HAS_VFX_GRAPH
+            if (TargetsVFX())
+                gui = typeof(VFXGenericShaderGraphMaterialGUI);
 #endif
+            context.AddCustomEditorForRenderPipeline(gui.FullName, universalRPType);
             context.AddSubShader(PostProcessSubShader(SubShaders.SpriteLit(target)));
         }
 
@@ -266,6 +267,7 @@ static class SpriteLitRequiredFields
 
             public static FieldCollection Normal = new FieldCollection()
             {
+                StructFields.Varyings.color,
                 StructFields.Varyings.normalWS,
                 StructFields.Varyings.tangentWS,
             };

Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs

@@ -23,13 +23,14 @@ public override void Setup(ref TargetSetupContext context)
         {
             base.Setup(ref context);
             context.AddAssetDependency(kSourceCodeGuid, AssetCollection.Flags.SourceDependency);
-#if HAS_VFX_GRAPH
+
             var universalRPType = typeof(UnityEngine.Rendering.Universal.UniversalRenderPipelineAsset);
-            if (TargetsVFX() && !context.HasCustomEditorForRenderPipeline(universalRPType))
-            {
-                context.AddCustomEditorForRenderPipeline(typeof(VFXGenericShaderGraphMaterialGUI).FullName, universalRPType);
-            }
+            var gui = typeof(ShaderGraphSpriteGUI);
+#if HAS_VFX_GRAPH
+            if (TargetsVFX())
+                gui = typeof(VFXGenericShaderGraphMaterialGUI);
 #endif
+            context.AddCustomEditorForRenderPipeline(gui.FullName, universalRPType);
             context.AddSubShader(PostProcessSubShader(SubShaders.SpriteUnlit(target)));
         }
 

Packages/com.unity.render-pipelines.universal/Editor/ShaderGUI/.buginfo

@@ -1 +1 @@
-area: Material
+area: Materials

Packages/com.unity.render-pipelines.universal/Editor/ShaderGUI/ShadergraphSpriteGUI.cs

@@ -0,0 +1,30 @@
+using UnityEngine;
+
+namespace UnityEditor
+{
+    // Used for ShaderGraph Sprite shaders
+    class ShaderGraphSpriteGUI : BaseShaderGUI
+    {
+        protected override uint materialFilter => uint.MaxValue & ~(uint)Expandable.SurfaceOptions;
+
+        MaterialProperty[] properties;
+
+        // collect properties from the material properties
+        public override void FindProperties(MaterialProperty[] properties)
+        {
+            // save off the list of all properties for shadergraph
+            this.properties = properties;
+
+            var material = materialEditor?.target as Material;
+            if (material == null)
+                return;
+
+            base.FindProperties(properties);
+        }
+
+        public override void DrawSurfaceInputs(Material material)
+        {
+            DrawShaderGraphProperties(material, properties);
+        }
+    }
+}

Packages/com.unity.render-pipelines.universal/Editor/ShaderGUI/ShadergraphSpriteGUI.cs.meta

@@ -1650,6 +1650,7 @@ static class CorePragmas
         {
             { Pragma.Target(ShaderModel.Target20) },
             { Pragma.ExcludeRenderers(new[] { Platform.D3D9 }) },
+            { Pragma.MultiCompileInstancing },
             { Pragma.Vertex("vert") },
             { Pragma.Fragment("frag") },
         };