Universal/light layers

com.unity.render-pipelines.universal/CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added View Vector node to mimic old behavior of View Direction node in URP.
 - Added support for the PlayStation 5 platform.
 - Enabled deferred renderer in UI.
+- Light layers interface.
 
 ### Changed
 - The Forward Renderer asset is renamed to the Universal Renderer asset. The Universal Renderer asset contains the property Rendering Path that lets you select the Forward or the Deferred Rendering Path.

com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalLitSubTarget.cs

@@ -691,6 +691,7 @@ static class LitKeywords
                 { CoreKeywordDescriptors.ShadowsSoft },
                 { CoreKeywordDescriptors.LightmapShadowMixing },
                 { CoreKeywordDescriptors.ShadowsShadowmask },
+                { CoreKeywordDescriptors.LightLayers },
             };
 
             public static readonly KeywordCollection GBuffer = new KeywordCollection
@@ -701,6 +702,7 @@ static class LitKeywords
                 { CoreKeywordDescriptors.ShadowsSoft },
                 { CoreKeywordDescriptors.LightmapShadowMixing },
                 { CoreKeywordDescriptors.MixedLightingSubtractive },
+                { CoreKeywordDescriptors.LightLayers },
                 { GBufferNormalsOct },
             };
 

com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs

@@ -551,6 +551,7 @@ static class CorePragmas
             { Pragma.OnlyRenderers(new[] { Platform.GLES, Platform.GLES3, Platform.GLCore }) },
             { Pragma.MultiCompileInstancing },
             { Pragma.MultiCompileFog },
+            { Pragma.InstancingOptions(InstancingOptions.RenderingLayer) },
             { Pragma.Vertex("vert") },
             { Pragma.Fragment("frag") },
         };
@@ -587,6 +588,7 @@ static class CorePragmas
             { Pragma.ExcludeRenderers(new[] { Platform.GLES, Platform.GLES3, Platform.GLCore }) },
             { Pragma.MultiCompileInstancing },
             { Pragma.MultiCompileFog },
+            { Pragma.InstancingOptions(InstancingOptions.RenderingLayer) },
             { Pragma.DOTSInstancing },
             { Pragma.Vertex("vert") },
             { Pragma.Fragment("frag") },
@@ -598,6 +600,7 @@ static class CorePragmas
             { Pragma.ExcludeRenderers(new[] { Platform.GLES, Platform.GLES3, Platform.GLCore }) },
             { Pragma.MultiCompileInstancing },
             { Pragma.MultiCompileFog },
+            { Pragma.InstancingOptions(InstancingOptions.RenderingLayer) },
             { Pragma.DOTSInstancing },
             { Pragma.Vertex("vert") },
             { Pragma.Fragment("frag") },
@@ -802,6 +805,15 @@ static class CoreKeywordDescriptors
             scope = KeywordScope.Global,
         };
 
+        public static readonly KeywordDescriptor LightLayers = new KeywordDescriptor()
+        {
+            displayName = "Light Layers",
+            referenceName = "_LIGHT_LAYERS",
+            type = KeywordType.Boolean,
+            definition = KeywordDefinition.MultiCompile,
+            scope = KeywordScope.Global,
+        };
+
         public static readonly KeywordDescriptor SmoothnessChannel = new KeywordDescriptor()
         {
             displayName = "Smoothness Channel",

com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs

@@ -26,7 +26,8 @@ enum ShaderFeatures
         DeferredWithoutAccurateGbufferNormals = (1 << 10),
         ScreenSpaceOcclusion = (1 << 11),
         ScreenSpaceShadows = (1 << 12),
-        UseFastSRGBLinearConversion = (1 << 13)
+        UseFastSRGBLinearConversion = (1 << 13),
+        LightLayers = (1 << 14),
     }
 
     internal class ShaderPreprocessor : IPreprocessShaders
@@ -60,6 +61,7 @@ internal class ShaderPreprocessor : IPreprocessShaders
         ShaderKeyword m_UseDrawProcedural = new ShaderKeyword(ShaderKeywordStrings.UseDrawProcedural);
         ShaderKeyword m_ScreenSpaceOcclusion = new ShaderKeyword(ShaderKeywordStrings.ScreenSpaceOcclusion);
         ShaderKeyword m_UseFastSRGBLinearConversion = new ShaderKeyword(ShaderKeywordStrings.UseFastSRGBLinearConversion);
+        ShaderKeyword m_LightLayers = new ShaderKeyword(ShaderKeywordStrings.LightLayers);
 
         ShaderKeyword m_LocalDetailMulx2;
         ShaderKeyword m_LocalDetailScaled;
@@ -136,6 +138,10 @@ bool StripUnusedFeatures(ShaderFeatures features, Shader shader, ShaderSnippetDa
                 !IsFeatureEnabled(features, ShaderFeatures.MixedLighting))
                 return true;
 
+            if (compilerData.shaderKeywordSet.IsEnabled(m_LightLayers) &&
+                !IsFeatureEnabled(features, ShaderFeatures.LightLayers))
+                return true;
+
             // No additional light shadows
             bool isAdditionalLightShadow = compilerData.shaderKeywordSet.IsEnabled(m_AdditionalLightShadows);
             if (!IsFeatureEnabled(features, ShaderFeatures.AdditionalLightShadows) && isAdditionalLightShadow)
@@ -427,6 +433,9 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline
             if (pipelineAsset.useFastSRGBLinearConversion)
                 shaderFeatures |= ShaderFeatures.UseFastSRGBLinearConversion;
 
+            if (pipelineAsset.supportsLightLayers)
+                shaderFeatures |= ShaderFeatures.LightLayers;
+
             bool hasScreenSpaceShadows = false;
             bool hasScreenSpaceOcclusion = false;
             bool hasDeferredRenderer = false;

com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAssetEditor.cs

@@ -74,6 +74,7 @@ internal class Styles
             public static GUIContent srpBatcher = EditorGUIUtility.TrTextContent("SRP Batcher", "If enabled, the render pipeline uses the SRP batcher.");
             public static GUIContent dynamicBatching = EditorGUIUtility.TrTextContent("Dynamic Batching", "If enabled, the render pipeline will batch drawcalls with few triangles together by copying their vertex buffers into a shared buffer on a per-frame basis.");
             public static GUIContent mixedLightingSupportLabel = EditorGUIUtility.TrTextContent("Mixed Lighting", "Makes the render pipeline include mixed-lighting Shader Variants in the build.");
+            public static GUIContent supportsLightLayers = EditorGUIUtility.TrTextContent("Light Layers", "When enabled, UniversalRP uses rendering layers instead of culling mask for the purpose of selecting how lights affect groups of geometry. For deferred rendering, an extra render target is allocated.");
             public static GUIContent debugLevel = EditorGUIUtility.TrTextContent("Debug Level", "Controls the level of debug information generated by the render pipeline. When Profiling is selected, the pipeline provides detailed profiling tags.");
             public static GUIContent shaderVariantLogLevel = EditorGUIUtility.TrTextContent("Shader Variant Log Level", "Controls the level logging in of shader variants information is outputted when a build is performed. Information will appear in the Unity console when the build finishes.");
 
@@ -145,6 +146,7 @@ internal class Styles
         SerializedProperty m_SRPBatcher;
         SerializedProperty m_SupportsDynamicBatching;
         SerializedProperty m_MixedLightingSupportedProp;
+        SerializedProperty m_SupportsLightLayers;
         SerializedProperty m_DebugLevelProp;
 
         SerializedProperty m_ShaderVariantLogLevel;
@@ -225,6 +227,7 @@ void OnEnable()
             m_SRPBatcher = serializedObject.FindProperty("m_UseSRPBatcher");
             m_SupportsDynamicBatching = serializedObject.FindProperty("m_SupportsDynamicBatching");
             m_MixedLightingSupportedProp = serializedObject.FindProperty("m_MixedLightingSupported");
+            m_SupportsLightLayers = serializedObject.FindProperty("m_SupportsLightLayers");
             m_DebugLevelProp = serializedObject.FindProperty("m_DebugLevel");
 
             m_ShaderVariantLogLevel = serializedObject.FindProperty("m_ShaderVariantLogLevel");
@@ -608,6 +611,7 @@ void DrawAdvancedSettings()
                 EditorGUILayout.PropertyField(m_SRPBatcher, Styles.srpBatcher);
                 EditorGUILayout.PropertyField(m_SupportsDynamicBatching, Styles.dynamicBatching);
                 EditorGUILayout.PropertyField(m_MixedLightingSupportedProp, Styles.mixedLightingSupportLabel);
+                EditorGUILayout.PropertyField(m_SupportsLightLayers, Styles.supportsLightLayers);
                 EditorGUILayout.PropertyField(m_DebugLevelProp, Styles.debugLevel);
                 EditorGUILayout.PropertyField(m_ShaderVariantLogLevel, Styles.shaderVariantLogLevel);
                 EditorGUI.indentLevel--;

com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineLightEditor.cs

@@ -58,6 +58,10 @@ class Styles
                 new GUIContent("Custom"),
                 new GUIContent("Use Pipeline Settings")
             };
+
+            public readonly GUIContent LightLayer = EditorGUIUtility.TrTextContent("Light Layer", "Specifies the current Light Layers that the Light affects. This Light illuminates corresponding Renderers with the same Light Layer flags.");
+            public readonly GUIContent linkLightAndShadowLayers = EditorGUIUtility.TrTextContent("Link Light Layer", "When enabled, the Light Layer property in the General section specifies the light layers for both lighting and for shadows. When disabled, you can use the Light Layer property below to specify the light layers for shadows seperately to lighting.");
+            public readonly GUIContent ShadowLayer = EditorGUIUtility.TrTextContent("Shadow Layer", "Specifies the light layer to use for shadows.");
         }
 
         static Styles s_Styles;
@@ -91,6 +95,10 @@ class Styles
         SerializedProperty m_UseAdditionalDataProp;                     // Does light use shadow bias settings defined in UniversalRP asset file?
         SerializedProperty m_AdditionalLightsShadowResolutionTierProp;  // Index of the AdditionalLights ShadowResolution Tier
 
+        SerializedProperty m_LightLayersMask;
+        SerializedProperty m_LinkLightLayers;
+        SerializedProperty m_ShadowLayersMask;
+
         protected override void OnEnable()
         {
             m_AdditionalLightData = lightProperty.gameObject.GetComponent<UniversalAdditionalLightData>();
@@ -107,11 +115,20 @@ void init(UniversalAdditionalLightData additionalLightData)
             m_UseAdditionalDataProp = m_AdditionalLightDataSO.FindProperty("m_UsePipelineSettings");
             m_AdditionalLightsShadowResolutionTierProp = m_AdditionalLightDataSO.FindProperty("m_AdditionalLightsShadowResolutionTier");
 
+            m_LightLayersMask = m_AdditionalLightDataSO.FindProperty("m_LightLayersMask");
+            m_LinkLightLayers = m_AdditionalLightDataSO.FindProperty("m_LinkLightLayers");
+            m_ShadowLayersMask = m_AdditionalLightDataSO.FindProperty("m_ShadowLayersMask");
+
             settings.ApplyModifiedProperties();
         }
 
         public override void OnInspectorGUI()
         {
+            // Light layers are stored in additional light data. We must create one if it doesn't exist.
+            UniversalRenderPipelineAsset urpAsset = UniversalRenderPipeline.asset;
+            if (urpAsset.supportsLightLayers && m_AdditionalLightDataSO == null)
+                CreateAdditionalLightData();
+
             if (s_Styles == null)
                 s_Styles = new Styles();
 
@@ -173,7 +190,26 @@ public override void OnInspectorGUI()
             ShadowsGUI();
 
             settings.DrawRenderMode();
-            settings.DrawCullingMask();
+
+            if (UniversalRenderPipeline.asset.supportsLightLayers)
+            {
+                EditorGUI.BeginChangeCheck();
+                DrawLightLayerMask(m_LightLayersMask, s_Styles.LightLayer);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    if (m_LinkLightLayers.boolValue)
+                    {
+                        m_ShadowLayersMask.intValue = m_LightLayersMask.intValue;
+                        lightProperty.renderingLayerMask = m_LightLayersMask.intValue;
+                    }
+
+                    m_AdditionalLightDataSO.ApplyModifiedProperties();
+                }
+            }
+            else
+                settings.DrawCullingMask();
+
+            settings.ApplyModifiedProperties();
 
             EditorGUILayout.Space();
 
@@ -235,7 +271,6 @@ void DrawSpotAngle()
 
         void DrawAdditionalShadowData()
         {
-            bool hasChanged = false;
             int selectedUseAdditionalData; // 0: Custom bias - 1: Bias values defined in Pipeline settings
 
             if (m_AdditionalLightDataSO == null)
@@ -252,13 +287,11 @@ void DrawAdditionalShadowData()
             Rect controlRectAdditionalData = EditorGUILayout.GetControlRect(true);
             if (m_AdditionalLightDataSO != null)
                 EditorGUI.BeginProperty(controlRectAdditionalData, Styles.shadowBias, m_UseAdditionalDataProp);
-            EditorGUI.BeginChangeCheck();
 
+            EditorGUI.BeginChangeCheck();
             selectedUseAdditionalData = EditorGUI.IntPopup(controlRectAdditionalData, Styles.shadowBias, selectedUseAdditionalData, Styles.displayedDefaultOptions, Styles.optionDefaultValues);
-            if (EditorGUI.EndChangeCheck())
-            {
-                hasChanged = true;
-            }
+            bool useAdditionalLightDataChanged = EditorGUI.EndChangeCheck();
+
             if (m_AdditionalLightDataSO != null)
                 EditorGUI.EndProperty();
 
@@ -272,19 +305,16 @@ void DrawAdditionalShadowData()
                 m_AdditionalLightDataSO.ApplyModifiedProperties();
             }
 
-            if (hasChanged)
+            if (useAdditionalLightDataChanged)
             {
                 if (m_AdditionalLightDataSO == null)
                 {
-                    lightProperty.gameObject.AddComponent<UniversalAdditionalLightData>();
-                    m_AdditionalLightData = lightProperty.gameObject.GetComponent<UniversalAdditionalLightData>();
+                    CreateAdditionalLightData();
 
                     var asset = UniversalRenderPipeline.asset;
                     settings.shadowsBias.floatValue = asset.shadowDepthBias;
                     settings.shadowsNormalBias.floatValue = asset.shadowNormalBias;
                     settings.shadowsResolution.intValue = UniversalAdditionalLightData.AdditionalLightsShadowDefaultCustomResolution;
-
-                    init(m_AdditionalLightData);
                 }
 
                 m_UseAdditionalDataProp.intValue = selectedUseAdditionalData;
@@ -422,6 +452,31 @@ void ShadowsGUI()
                 }
             }
 
+            if (UniversalRenderPipeline.asset.supportsLightLayers)
+            {
+                EditorGUI.BeginChangeCheck();
+                EditorGUILayout.PropertyField(m_LinkLightLayers, s_Styles.linkLightAndShadowLayers);
+                // Undo the changes in the light component because the SyncLightAndShadowLayers will change the value automatically when link is ticked
+                if (EditorGUI.EndChangeCheck())
+                {
+                    if (m_LinkLightLayers.boolValue)
+                        m_ShadowLayersMask.intValue = m_LightLayersMask.intValue;
+                    lightProperty.renderingLayerMask = m_ShadowLayersMask.intValue;
+                    m_AdditionalLightDataSO.ApplyModifiedProperties();
+                }
+
+                using (new EditorGUI.DisabledGroupScope(m_LinkLightLayers.boolValue))
+                {
+                    EditorGUI.BeginChangeCheck();
+                    DrawLightLayerMask(m_ShadowLayersMask, s_Styles.ShadowLayer);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        lightProperty.renderingLayerMask = m_ShadowLayersMask.intValue;
+                        m_AdditionalLightDataSO.ApplyModifiedProperties();
+                    }
+                }
+            }
+
             EditorGUI.indentLevel -= 1;
 
             if (bakingWarningValue)
@@ -430,6 +485,28 @@ void ShadowsGUI()
             EditorGUILayout.Space();
         }
 
+        void CreateAdditionalLightData()
+        {
+            lightProperty.gameObject.AddComponent<UniversalAdditionalLightData>();
+            m_AdditionalLightData = lightProperty.gameObject.GetComponent<UniversalAdditionalLightData>();
+            init(m_AdditionalLightData);
+        }
+
+        internal static void DrawLightLayerMask(SerializedProperty property, GUIContent label)
+        {
+            Rect lineRect = GUILayoutUtility.GetRect(1, EditorGUIUtility.singleLineHeight);
+            int lightLayer = property.intValue;
+
+            EditorGUI.BeginProperty(lineRect, label, property);
+
+            EditorGUI.BeginChangeCheck();
+            lightLayer = EditorGUI.MaskField(lineRect, label ?? GUIContent.none, lightLayer, UniversalRenderPipeline.asset.lightLayerMaskNames);
+            if (EditorGUI.EndChangeCheck())
+                property.intValue = lightLayer;
+
+            EditorGUI.EndProperty();
+        }
+
         protected override void OnSceneGUI()
         {
             if (!(GraphicsSettings.currentRenderPipeline is UniversalRenderPipelineAsset))

com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs

@@ -100,6 +100,22 @@ public enum ColorGradingMode
     [ExcludeFromPreset]
     public partial class UniversalRenderPipelineAsset : RenderPipelineAsset, ISerializationCallbackReceiver
     {
+        // Rendering layer settings.
+        // HDRP use GetRenderingLayerMaskNames to create its light linking system
+        // Mean here we define our name for light linking.
+        static readonly string[] k_RenderingLayerNames = new string[]
+        {
+            "Light Layer default", "Light Layer 1", "Light Layer 2", "Light Layer 3", "Light Layer 4", "Light Layer 5", "Light Layer 6", "Light Layer 7",
+            "Unused 0", "Unused 1", "Unused 2", "Unused 3", "Unused 4", "Unused 5", "Unused 6", "Unused 7",
+            "Unused 8", "Unused 9", "Unused 10", "Unused 11", "Unused 12", "Unused 13", "Unused 14", "Unused 15",
+            "Unused 16", "Unused 17", "Unused 18", "Unused 19", "Unused 20", "Unused 21", "Unused 22", "Unused 23"
+        };
+
+        static readonly string[] k_LightLayerNames = new string[]
+        {
+            "Light Layer default", "Light Layer 1", "Light Layer 2", "Light Layer 3", "Light Layer 4", "Light Layer 5", "Light Layer 6", "Light Layer 7"
+        };
+
         Shader m_DefaultShader;
         ScriptableRenderer[] m_Renderers = new ScriptableRenderer[1];
 
@@ -158,6 +174,7 @@ public partial class UniversalRenderPipelineAsset : RenderPipelineAsset, ISerial
         [SerializeField] bool m_UseSRPBatcher = true;
         [SerializeField] bool m_SupportsDynamicBatching = false;
         [SerializeField] bool m_MixedLightingSupported = true;
+        [SerializeField] bool m_SupportsLightLayers = false;
         [SerializeField][Obsolete] PipelineDebugLevel m_DebugLevel;
 
         // Adaptive performance settings
@@ -709,6 +726,11 @@ public bool supportsMixedLighting
             get { return m_MixedLightingSupported; }
         }
 
+        public bool supportsLightLayers
+        {
+            get { return m_SupportsLightLayers; }
+        }
+
         public ShaderVariantLogLevel shaderVariantLogLevel
         {
             get { return m_ShaderVariantLogLevel; }
@@ -870,6 +892,14 @@ public override Shader defaultSpeedTree8Shader
         }
 #endif
 
+        /// <summary>Names used for display of rendering layer masks.</summary>
+        public override string[] renderingLayerMaskNames => k_RenderingLayerNames;
+
+        /// <summary>
+        /// Names used for display of light layers.
+        /// </summary>
+        public string[] lightLayerMaskNames { get { return k_LightLayerNames; } }
+
         public void OnBeforeSerialize()
         {
         }