Fixing issues with later unity version and deferred rendering

Author: Zallist

Plugins/UniversalShaderGraphExtensions/Editor/UniversalTargetExtensions/Includes/SimpleLitGBufferPass.hlsl

@@ -127,10 +127,14 @@ FragmentOutput frag(PackedVaryings packedInput)
     surface.clearCoatMask       = 0;
     surface.clearCoatSmoothness = 1;
 
+#if UNITY_VERSION >= 202210
+    surface.albedo = AlphaModulate(surface.albedo, surface.alpha);
+#endif
+
     Light mainLight = GetMainLight(inputData.shadowCoord, inputData.positionWS, inputData.shadowMask);
     MixRealtimeAndBakedGI(mainLight, inputData.normalWS, inputData.bakedGI, inputData.shadowMask);
     //half3 color = GlobalIllumination(brdfData, inputData.bakedGI, surfaceDescription.Occlusion, inputData.positionWS, inputData.normalWS, inputData.viewDirectionWS);
-    half4 color = half4(inputData.bakedGI * surfaceDescription.BaseColor + surfaceDescription.Emission, surfaceDescription.Alpha);
+    half4 color = half4(inputData.bakedGI * surface.albedo + surface.emission, surface.alpha);
 
     //return BRDFDataToGbuffer(brdfData, inputData, surfaceDescription.Smoothness, surfaceDescription.Emission + color, surfaceDescription.Occlusion);
     return SurfaceDataToGbuffer(surface, inputData, color.rgb, kLightingSimpleLit);

Plugins/UniversalShaderGraphExtensions/Editor/UniversalTargetExtensions/Targets/UniversalSimpleLitSubTarget.cs

@@ -17,6 +17,9 @@ sealed class UniversalSimpleLitSubTarget : UniversalSubTarget/*, ILegacyTarget*/
     {
         static readonly GUID kSourceCodeGuid = new GUID("d6c78107b64145745805d963de80cc28"); // UniversalSimpleLitSubTarget.cs
 
+        // Should be in UniversalTarget
+        public const string kSimpleLitMaterialTypeTag = "\"UniversalMaterialType\" = \"SimpleLit\"";
+
 #if UNITY_2022_1_OR_NEWER
         public override int latestVersion => 1;
 #endif
@@ -374,7 +377,8 @@ public static SubShaderDescriptor SimpleLitComputeDotsSubShader(UniversalTarget
                 SubShaderDescriptor result = new SubShaderDescriptor()
                 {
                     pipelineTag = UniversalTarget.kPipelineTag,
-                    customTags = UniversalTarget.kLitMaterialTypeTag,
+                    //customTags = UniversalTarget.kLitMaterialTypeTag,
+                    customTags = kSimpleLitMaterialTypeTag,
                     renderType = renderType,
                     renderQueue = renderQueue,
                     generatesPreview = true,
@@ -433,7 +437,8 @@ public static SubShaderDescriptor SimpleLitGLESSubShader(UniversalTarget target,
                 SubShaderDescriptor result = new SubShaderDescriptor()
                 {
                     pipelineTag = UniversalTarget.kPipelineTag,
-                    customTags = UniversalTarget.kLitMaterialTypeTag,
+                    //customTags = UniversalTarget.kLitMaterialTypeTag,
+                    customTags = kSimpleLitMaterialTypeTag,
                     renderType = renderType,
                     renderQueue = renderQueue,
                     generatesPreview = true,