[Port] [2021.3] ShaderGraph: remove duplicate LIGHTMAP_ON and DIRLIGHTMAP_COMBINED variants for builtin-deferred

svc-reach-platform-support · Evergreen · commit 90eb487a5354 · 2025-03-18T10:43:35.000Z
diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs
@@ -576,8 +576,6 @@ static class LitKeywords
 
             public static readonly KeywordCollection Deferred = new KeywordCollection
             {
-                { CoreKeywordDescriptors.Lightmap },
-                { CoreKeywordDescriptors.DirectionalLightmapCombined },
                 { CoreKeywordDescriptors.MainLightShadows },
                 { CoreKeywordDescriptors.ShadowsSoft },
                 { CoreKeywordDescriptors.LightmapShadowMixing },

Original file line number	Diff line number	Diff line change
`@@ -576,8 +576,6 @@ static class LitKeywords`
`576`	`576`
`577`	`577`	`public static readonly KeywordCollection Deferred = new KeywordCollection`
`578`	`578`	`{`
`579`		`- { CoreKeywordDescriptors.Lightmap },`
`580`		`- { CoreKeywordDescriptors.DirectionalLightmapCombined },`
`581`	`579`	`{ CoreKeywordDescriptors.MainLightShadows },`
`582`	`580`	`{ CoreKeywordDescriptors.ShadowsSoft },`
`583`	`581`	`{ CoreKeywordDescriptors.LightmapShadowMixing },`