10.3.1/dynamic density volumes (#18)

* Apply patch from partner/crazyhunter-10.x.x-dynamic-density-volumes from the main Graphics repo

* Fix HLSL truncation warning in shader

* Eliminate the possibility of a null atlas texture by always allocating a 1x1x1 texture at minimum

* Change from one callback per volume to a single callback

* Remove time parameter from PrepareDensityVolumeData

* Address review comments
bonfirestudios/unity-com.unity.render-pipelines.high-definition#18

* Add UI to control density volume atlas size

* Statically allocate the density volume atlas instead of growing it

* Log error if density volumes exceed size of the atlas

Remove mipmap regeneration. Will be done in user code instead. (#21)

Density Volumes: Cleanup to the Density Volume Atlas management / update code. Additionally fixed a few bugs, and added profile markers for static atlas blits, dynamic atlas dispatches, and atlas mipmap generation. Currently we update the whole mip chain via GenerateMipmaps() if any static or dynamic density volumes trigger atlas updates. In the future we should look into generating mip data for only dirty regions of the atlas, probably in compute. (#73)

Dynamic Density Volumes: Add HDRenderPipelineResources

Author: ApoorvaJ

com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/DensityVolumeUI.Drawer.cs

@@ -13,7 +13,8 @@ static partial class DensityVolumeUI
         enum Expandable
         {
             Volume = 1 << 0,
-            DensityMaskTexture = 1 << 1
+            DensityMaskTexture = 1 << 1,
+            DensityMaskShader = 1 << 2
         }
 
         readonly static ExpandedState<Expandable, DensityVolume> k_ExpandedState = new ExpandedState<Expandable, DensityVolume>(Expandable.Volume | Expandable.DensityMaskTexture, "HDRP");
@@ -30,6 +31,10 @@ enum Expandable
             CED.FoldoutGroup(
                 Styles.k_DensityMaskTextureHeader, Expandable.DensityMaskTexture, k_ExpandedState,
                 Drawer_DensityMaskTextureContent
+                ),
+            CED.FoldoutGroup(
+                Styles.k_DensityMaskShaderHeader, Expandable.DensityMaskShader, k_ExpandedState,
+                Drawer_DensityMaskShaderContent
                 )
             );
 
@@ -181,5 +186,23 @@ static void Drawer_DensityMaskTextureContent(SerializedDensityVolume serialized,
             EditorGUILayout.PropertyField(serialized.textureScroll, Styles.s_TextureScrollLabel);
             EditorGUILayout.PropertyField(serialized.textureTile, Styles.s_TextureTileLabel);
         }
+
+        static void Drawer_DensityMaskShaderContent(SerializedDensityVolume serialized, Editor owner)
+        {
+            EditorGUILayout.PropertyField(serialized.volumeShader, Styles.s_VolumeShaderLabel);
+
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField(Styles.s_VolumeShaderResolutionLabel);
+            EditorGUI.BeginChangeCheck();
+            int x = EditorGUILayout.DelayedIntField(serialized.volumeShaderResolution.vector3IntValue.x);
+            int y = EditorGUILayout.DelayedIntField(serialized.volumeShaderResolution.vector3IntValue.y);
+            int z = EditorGUILayout.DelayedIntField(serialized.volumeShaderResolution.vector3IntValue.z);
+            EditorGUILayout.EndHorizontal();
+            if (EditorGUI.EndChangeCheck())
+            {
+                Vector3Int resolutionNext = DensityVolume.FixupDynamicVolumeResolution(new Vector3Int(x, y, z));
+                serialized.volumeShaderResolution.vector3IntValue = resolutionNext;
+            }
+        }
     }
 }

com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/DensityVolumeUI.Skin.cs

@@ -8,6 +8,7 @@ internal static class Styles
         {
             public static readonly GUIContent k_VolumeHeader = new GUIContent("Volume");
             public static readonly GUIContent k_DensityMaskTextureHeader = new GUIContent("Density Mask Texture");
+            public static readonly GUIContent k_DensityMaskShaderHeader = new GUIContent("Density Mask Shader");
 
             public static readonly GUIContent[] s_Toolbar_Contents = new GUIContent[]
             {
@@ -21,6 +22,8 @@ internal static class Styles
             public static readonly GUIContent s_VolumeTextureLabel = new GUIContent("Texture", "The fog Texture for the Density Mask. Generate this Texture type using the Density Volume Texture Tool.");
             public static readonly GUIContent s_TextureScrollLabel = new GUIContent("Scroll Speed", "Modify the speed for each axis at which HDRP scrolls the fog Texture.");
             public static readonly GUIContent s_TextureTileLabel = new GUIContent("Tiling", "Modify the tiling of the fog Texture on each axis individually.");
+            public static readonly GUIContent s_VolumeShaderLabel = new GUIContent("Shader", "The fog shader for the Density Mask.");
+            public static readonly GUIContent s_VolumeShaderResolutionLabel = new GUIContent("Resolution", "The resolution of the texture that the shader will write to.");
             public static readonly GUIContent s_BlendLabel = new GUIContent("Blend Distance", "Interior distance from the Size where the fog fades in completely.");
             public static readonly GUIContent s_InvertFadeLabel = new GUIContent("Invert Blend", "Inverts blend values so 0 becomes the new maximum value and the original maximum value becomes 0.");
             public static readonly GUIContent s_ManipulatonTypeContent = EditorGUIUtility.TrTextContent("Per Axis Control", "When checked, each face can be manipulated separatly. This also include fading options.");

com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/SerializedDensityVolume.cs

@@ -11,6 +11,8 @@ class SerializedDensityVolume
         public SerializedProperty volumeTexture;
         public SerializedProperty textureScroll;
         public SerializedProperty textureTile;
+        public SerializedProperty volumeShader;
+        public SerializedProperty volumeShaderResolution;
 
         public SerializedProperty size;
 
@@ -39,6 +41,8 @@ public SerializedDensityVolume(SerializedObject serializedObject)
             volumeTexture = densityParams.FindPropertyRelative("volumeMask");
             textureScroll = densityParams.FindPropertyRelative("textureScrollingSpeed");
             textureTile = densityParams.FindPropertyRelative("textureTiling");
+            volumeShader = densityParams.FindPropertyRelative("volumeShader");
+            volumeShaderResolution = densityParams.FindPropertyRelative("volumeShaderResolution");
 
             size = densityParams.FindPropertyRelative("size");
 

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs

@@ -31,6 +31,7 @@ public class GeneralSection
             public static readonly GUIContent lightingQualitySettings = EditorGUIUtility.TrTextContent("Lighting Quality Settings");
 
             public static readonly GUIContent lightLayerSubTitle = EditorGUIUtility.TrTextContent("Light Layers");
+            public static readonly GUIContent volumetricsSubTitle = EditorGUIUtility.TrTextContent("Volumetrics");
             public static readonly GUIContent cookiesSubTitle = EditorGUIUtility.TrTextContent("Cookies");
             public static readonly GUIContent reflectionsSubTitle = EditorGUIUtility.TrTextContent("Reflections");
             public static readonly GUIContent skySubTitle = EditorGUIUtility.TrTextContent("Sky");
@@ -94,7 +95,7 @@ public class GeneralSection
             public static readonly GUIContent supportSSGIContent = EditorGUIUtility.TrTextContent("Screen Space Global Illumination", "When enabled, HDRP allocates memory for processing screen space global illumination (SSGI). This allows you to use SSGI in your Unity Project.");
             public static readonly GUIContent supportedSSSContent = EditorGUIUtility.TrTextContent("Subsurface Scattering", "When enabled, HDRP allocates memory for processing subsurface scattering (SSS). This allows you to use SSS in your Unity Project.");
             public static readonly GUIContent sssSampleBudget = EditorGUIUtility.TrTextContent("Sample Budget", "Maximum number of samples the Subsurface Scattering algorithm is allowed to take.");
-            public static readonly GUIContent supportVolumetricContent = EditorGUIUtility.TrTextContent("Volumetrics", "When enabled, HDRP allocates Shader variants and memory for volumetric effects. This allows you to use volumetric lighting and fog in your Unity Project.");
+            public static readonly GUIContent supportVolumetricContent = EditorGUIUtility.TrTextContent("Enable", "When enabled, HDRP allocates Shader variants and memory for volumetric effects. This allows you to use volumetric lighting and fog in your Unity Project.");
             public static readonly GUIContent volumetricResolutionContent = EditorGUIUtility.TrTextContent("High Quality ", "When enabled, HDRP increases the resolution of volumetric lighting buffers. Warning: There is a high performance cost, do not enable on consoles.");
             public static readonly GUIContent supportLightLayerContent = EditorGUIUtility.TrTextContent("Light Layers", "When enabled, HDRP allocates memory for processing Light Layers. This allows you to use Light Layers in your Unity Project. For deferred rendering, this allocation includes an extra render target in memory and extra cost.");
             public static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer Name 0", "The display name for Light Layer 0. This is purely cosmetic, and can be used to articulate intended use of Light Layer 0");
@@ -140,7 +141,7 @@ public class GeneralSection
             internal const string probeVolumeInfo = "Warning: Probe Volumes is a highly experimental feature.\nIt is disabled by default for this reason.\nIt's functionality is subject to breaking changes and whole sale removal.\nIt is not recommended for use outside of for providing feedback.\nIt should not be used in production.\nTo enable, set:\nProbeVolumesEvaluationMode = ProbeVolumesEvaluationModes.MaterialPass\ninside of ShaderConfig.cs\and inside of the editor run:\nEdit->Render Pipeline->Generate Shader Includes\nProbe Volumes feature must also be enabled here.";
             internal static readonly GUIContent probeVolumeAtlasResolution = EditorGUIUtility.TrTextContent("Atlas Resolution", "Resolution of the 3D texture atlas containing visible ProbeVolumes.");
             internal static readonly GUIContent probeVolumeAtlasOctahedralDepthResolution = EditorGUIUtility.TrTextContent("Octahedral Depth Atlas Resolution", "Resolution of the 2D texture atlas containing visible ProbeVolumes octahedral depth data.");
-
+            internal static readonly GUIContent densityVolumeAtlasResolution = EditorGUIUtility.TrTextContent("Density Atlas Resolution", "Resolution of the 3D texture atlas containing fog density.");
 
             public const string cacheErrorFormat = "This configuration will lead to more than 2 GB reserved for this cache at runtime! ({0} requested) Only {1} element will be reserved instead.";
             public const string cacheInfoFormat = "Reserving {0} in memory at runtime.";

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs

@@ -43,7 +43,8 @@ enum Expandable
             LightingQuality = 1 << 25,
             SSRQuality = 1 << 26,
             VirtualTexturing = 1 << 27,
-            FogQuality = 1 << 28
+            FogQuality = 1 << 28,
+            Volumetrics = 1 << 29
         }
 
         static readonly ExpandedState<Expandable, HDRenderPipelineAsset> k_ExpandedState = new ExpandedState<Expandable, HDRenderPipelineAsset>(Expandable.CameraFrameSettings | Expandable.General, "HDRP");
@@ -82,6 +83,7 @@ static HDRenderPipelineUI()
                     ),
                 CED.FoldoutGroup(Styles.lightingSectionTitle, Expandable.Lighting, k_ExpandedState,
                     CED.Group(GroupOption.Indent, Drawer_SectionLightingUnsorted),
+                    CED.FoldoutGroup(Styles.volumetricsSubTitle, Expandable.Volumetrics, k_ExpandedState, FoldoutOption.Indent | FoldoutOption.SubFoldout, Drawer_SectionVolumetrics),
                     CED.FoldoutGroup(Styles.cookiesSubTitle, Expandable.Cookie, k_ExpandedState, FoldoutOption.Indent | FoldoutOption.SubFoldout, Drawer_SectionCookies),
                     CED.FoldoutGroup(Styles.reflectionsSubTitle, Expandable.Reflection, k_ExpandedState, FoldoutOption.Indent | FoldoutOption.SubFoldout, Drawer_SectionReflection),
                     CED.FoldoutGroup(Styles.skySubTitle, Expandable.Sky, k_ExpandedState, FoldoutOption.Indent | FoldoutOption.SubFoldout, Drawer_SectionSky),
@@ -995,8 +997,6 @@ static void Drawer_SectionLightingUnsorted(SerializedHDRenderPipelineAsset seria
             EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportSSAO, Styles.supportSSAOContent);
             EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportSSGI, Styles.supportSSGIContent);
 
-            EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportVolumetrics, Styles.supportVolumetricContent);
-
             EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportLightLayers, Styles.supportLightLayerContent);
 
             if (ShaderConfig.s_ProbeVolumesEvaluationMode != ProbeVolumesEvaluationModes.Disabled)
@@ -1078,6 +1078,27 @@ static void Drawer_SectionLightingUnsorted(SerializedHDRenderPipelineAsset seria
 
             EditorGUILayout.Space(); //to separate with following sub sections
         }
+        static void Drawer_SectionVolumetrics(SerializedHDRenderPipelineAsset serialized, Editor owner)
+        {
+            EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportVolumetrics, Styles.supportVolumetricContent);
+
+            ++EditorGUI.indentLevel;
+            using (new EditorGUI.DisabledScope(!serialized.renderPipelineSettings.supportVolumetrics.boolValue))
+            {
+                EditorGUI.BeginChangeCheck();
+                EditorGUILayout.PropertyField(serialized.renderPipelineSettings.densityVolumeSettings.atlasResolution, Styles.densityVolumeAtlasResolution);
+                if (EditorGUI.EndChangeCheck())
+                    serialized.renderPipelineSettings.densityVolumeSettings.atlasResolution.vector3IntValue =
+                        Vector3Int.Min(
+                            Vector3Int.Max(
+                                serialized.renderPipelineSettings.densityVolumeSettings.atlasResolution.vector3IntValue,
+                                Vector3Int.one
+                            ),
+                            new Vector3Int(2048, 2048, 2048)
+                        );
+            }
+            --EditorGUI.indentLevel;
+        }
 
         static void Drawer_SectionMaterialUnsorted(SerializedHDRenderPipelineAsset serialized, Editor owner)
         {

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedDensityVolumeSettings.cs

@@ -0,0 +1,18 @@
+using UnityEngine.Rendering.HighDefinition;
+
+namespace UnityEditor.Rendering.HighDefinition
+{
+    class SerializedDensityVolumeSettings
+    {
+        internal SerializedProperty root;
+
+        internal SerializedProperty atlasResolution;
+
+        internal SerializedDensityVolumeSettings(SerializedProperty root)
+        {
+            this.root = root;
+
+            atlasResolution = root.Find((DensityVolumeSettings s) => s.atlasResolution);
+        }
+    }
+}

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedDensityVolumeSettings.cs.meta

@@ -79,6 +79,7 @@ class SerializedRenderPipelineSettings
         public SerializedPostProcessingQualitySettings postProcessQualitySettings;
         public SerializedLightingQualitySettings lightingQualitySettings;
         internal SerializedGlobalProbeVolumeSettings probeVolumeSettings;
+        internal SerializedDensityVolumeSettings densityVolumeSettings;
 
         public SerializedLightSettings lightSettings;
         public SerializedScalableSetting lodBias;
@@ -151,6 +152,8 @@ public SerializedRenderPipelineSettings(SerializedProperty root)
             postProcessQualitySettings = new SerializedPostProcessingQualitySettings(root.Find((RenderPipelineSettings s) => s.postProcessQualitySettings));
             probeVolumeSettings = new SerializedGlobalProbeVolumeSettings(root.Find((RenderPipelineSettings s) => s.probeVolumeSettings));
 
+            densityVolumeSettings = new SerializedDensityVolumeSettings(root.Find((RenderPipelineSettings s) => s.densityVolumeSettings));
+
             lightSettings = new SerializedLightSettings(root.Find((RenderPipelineSettings s) => s.lightSettings));
             lodBias = new SerializedScalableSetting(root.Find((RenderPipelineSettings s) => s.lodBias));
             maximumLODLevel = new SerializedScalableSetting(root.Find((RenderPipelineSettings s) => s.maximumLODLevel));