Probe Volume:

Probe Volumes: Fix case when ShaderConfig enables them, but they have not yet been enabled in the frame settings. Previously this case would spill errors about unassigned compute parameters like _ProbeVolumeAtlasSH - this comes up when creating standalone HDRP template projects for repro demos

Probe Volume sampling quality (#102)

* Added a frame setting for Probe Volume lighting sampling quality between SHL0, SHL1 and SHL2.

* Probe Volume sampling quality cleanup.

* WIP switch Probe Volume spherical harmonics level with global keywords. L0 and L1 are not supported by Dynamic GI yet.

* Implemented missing SH L0 and L1 modes for Dynamic GI.

* Removed Probe Volume SHL0 option to save shader variants. Fixed Volumetric Lighting.

* Fixed VFX shaders after introducing different Probe Volume encodings.

* Support baking SHL2 fallback radiance from within the SHL1 mode. Cleanup.

Check if probeVolumeAtlas is null before trying to release a slot from it. The atlas could be not created yet as we are doing it later in a rendering now to match the selected SH encoding for a given frame. (#108)

Probe Volumes: Remove an unnecessary editor only GC.Alloc

Reflection Probe Normalization: Fix bad rebase merge of reflection probe normalization code

Author: pastasfuture

com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs

@@ -110,9 +110,6 @@ public enum ShaderOptions
         /// <summary>The probe volume bilateral filtering sample mode.</summary>
         /// <seealso cref="ProbeVolumesBilateralFilteringSampleModes"/>
         ProbeVolumesBilateralFilteringSampleMode = ProbeVolumesBilateralFilteringSampleModes.ApproximateSample,
-        /// <summary>The probe volume encoding method.</summary>
-        /// <seealso cref="ProbeVolumesEncodingModes"/>
-        ProbeVolumesEncodingMode = ProbeVolumesEncodingModes.SphericalHarmonicsL2,
 
         /// <summary>Support for area lights.</summary>
         AreaLights = 1,
@@ -158,9 +155,6 @@ public class ShaderConfig
         /// <summary>Specifies the probe volume filtering mode.</summary>
         ///<seealso cref="ShaderOptions.ProbeVolumesBilateralFilteringMode"/>
         public static ProbeVolumesBilateralFilteringSampleModes s_ProbeVolumesBilateralFilteringSampleMode = (ProbeVolumesBilateralFilteringSampleModes)ShaderOptions.ProbeVolumesBilateralFilteringSampleMode;
-        /// <summary>Specifies the probe volume encoding method.</summary>
-        ///<seealso cref="ShaderOptions.ProbeVolumesEncodingMode"/>
-        public static ProbeVolumesEncodingModes s_ProbeVolumesEncodingMode = (ProbeVolumesEncodingModes)ShaderOptions.ProbeVolumesEncodingMode;
         /// <summary>Indicates whether to support area lights.</summary>
         ///<seealso cref="ShaderOptions.AreaLights"/>
         public static int s_AreaLights = (int)ShaderOptions.AreaLights;

com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs.hlsl

@@ -43,7 +43,6 @@
 #define SHADEROPTIONS_PROBE_VOLUMES_ADDITIVE_BLENDING (1)
 #define SHADEROPTIONS_PROBE_VOLUMES_BILATERAL_FILTERING_MODE (1)
 #define SHADEROPTIONS_PROBE_VOLUMES_BILATERAL_FILTERING_SAMPLE_MODE (0)
-#define SHADEROPTIONS_PROBE_VOLUMES_ENCODING_MODE (2)
 #define SHADEROPTIONS_AREA_LIGHTS (1)
 #define SHADEROPTIONS_BARN_DOOR (0)
 

com.unity.render-pipelines.high-definition/Editor/Lighting/ProbeVolume/ProbeVolumeSHPreview.shader

@@ -29,6 +29,8 @@ Shader "Hidden/Debug/ProbeVolumeSHPreview"
             #pragma vertex vert
             #pragma fragment frag
 
+            #pragma multi_compile PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L1 PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L2
+
             #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
             #include "Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl"
             #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
@@ -125,14 +127,21 @@ Shader "Hidden/Debug/ProbeVolumeSHPreview"
 
 #if SHADEROPTIONS_PROBE_VOLUMES_EVALUATION_MODE != PROBEVOLUMESEVALUATIONMODES_DISABLED
 
-#if SHADEROPTIONS_PROBE_VOLUMES_ENCODING_MODE == PROBEVOLUMESENCODINGMODES_SPHERICAL_HARMONICS_L1
+#if defined(PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L0)
+                ProbeVolumeSphericalHarmonicsL0 coefficients;
+                ZERO_INITIALIZE(ProbeVolumeSphericalHarmonicsL0, coefficients);
+                ProbeVolumeLoadAccumulateSphericalHarmonicsL0(probeIndexAtlas3D, 1.0f, coefficients);
+                ProbeVolumeSwizzleAndNormalizeSphericalHarmonicsL0(coefficients);
+                outgoingRadiance = coefficients.data[0].xyz;
+
+#elif defined(PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L1)
                 ProbeVolumeSphericalHarmonicsL1 coefficients;
                 ZERO_INITIALIZE(ProbeVolumeSphericalHarmonicsL1, coefficients);
                 ProbeVolumeLoadAccumulateSphericalHarmonicsL1(probeIndexAtlas3D, 1.0f, coefficients);
                 ProbeVolumeSwizzleAndNormalizeSphericalHarmonicsL1(coefficients);
                 outgoingRadiance = SHEvalLinearL0L1(normalWS, coefficients.data[0], coefficients.data[1], coefficients.data[2]);
 
-#elif SHADEROPTIONS_PROBE_VOLUMES_ENCODING_MODE == PROBEVOLUMESENCODINGMODES_SPHERICAL_HARMONICS_L2
+#elif defined(PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L2)
                 ProbeVolumeSphericalHarmonicsL2 coefficients;
                 ZERO_INITIALIZE(ProbeVolumeSphericalHarmonicsL2, coefficients);
                 ProbeVolumeLoadAccumulateSphericalHarmonicsL2(probeIndexAtlas3D, 1.0f, coefficients);

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDTarget.cs

@@ -1150,6 +1150,20 @@ static class CoreKeywordDescriptors
             }
         };
 
+        public static KeywordDescriptor ProbeVolumesEncoding = new KeywordDescriptor()
+        {
+            displayName = "Probe Volumes Encoding",
+            referenceName = "PROBE_VOLUMES_ENCODING",
+            type = KeywordType.Enum,
+            definition = KeywordDefinition.MultiCompile,
+            scope = KeywordScope.Global,
+            entries = new KeywordEntry[]
+            {
+                new KeywordEntry() { displayName = "Spherical Harmonics L1", referenceName = "SPHERICAL_HARMONICS_L1" },
+                new KeywordEntry() { displayName = "Spherical Harmonics L2", referenceName = "SPHERICAL_HARMONICS_L2" },
+            }
+        };
+
         public static KeywordDescriptor SurfaceTypeTransparent = new KeywordDescriptor()
         {
             displayName = "Surface Type Transparent",

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/LightingSubTarget.cs

@@ -126,6 +126,7 @@ protected override void CollectPassKeywords(ref PassDescriptor pass)
             {
                 pass.keywords.Add(CoreKeywordDescriptors.Shadow);
                 pass.keywords.Add(CoreKeywordDescriptors.ScreenSpaceShadow);
+                pass.keywords.Add(CoreKeywordDescriptors.ProbeVolumesEncoding);
 
                 if (pass.lightMode == HDShaderPassNames.s_TransparentBackfaceStr)
                     pass.defines.Add(CoreKeywordDescriptors.LightList, 1);

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

@@ -341,6 +341,12 @@ static void Drawer_SectionLightingSettings(SerializedFrameSettings serialized, E
             // Probe Volumes
             area.AmmendInfo(FrameSettingsField.ProbeVolume, overrideable: () => hdrpSettings.supportProbeVolume);
             area.AmmendInfo(FrameSettingsField.NormalizeReflectionProbeWithProbeVolume, overrideable: () => hdrpSettings.supportProbeVolume);
+            area.AmmendInfo(FrameSettingsField.ProbeVolumeEncoding,
+                customGetter: () => (ProbeVolumesEncodingSetting)serialized.probeVolumeEncoding.intValue,       // Levels 1-2
+                customSetter: v  => serialized.probeVolumeEncoding.intValue = Math.Max(1, Math.Min((int)v, 2)), // Levels 1-2
+                hasMixedValues: serialized.probeVolumeEncoding.hasMultipleDifferentValues,
+                overrideable: () => hdrpSettings.supportProbeVolume
+            );
             area.AmmendInfo(FrameSettingsField.ProbeVolumeDynamicGI, overrideable: () => hdrpSettings.supportProbeVolume && hdrpSettings.supportProbeVolumeDynamicGI);
             area.AmmendInfo(FrameSettingsField.ProbeVolumeDynamicGIInfiniteBounces, overrideable: () => hdrpSettings.supportProbeVolume && hdrpSettings.supportProbeVolumeDynamicGI);
             area.AmmendInfo(FrameSettingsField.ProbeVolumeDynamicGIPropagationQuality,

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

@@ -20,6 +20,7 @@ class SerializedFrameSettings
         public SerializedProperty maximumLODLevel;
         public SerializedProperty maximumLODLevelMode;
         public SerializedProperty maximumLODLevelQualityLevel;
+        public SerializedProperty probeVolumeEncoding;
         public SerializedProperty probeVolumeDynamicGIPropagationQuality;
         public SerializedProperty probeVolumeDynamicGIMaxSimulationsPerFrame;
         public SerializedProperty probeVolumeDynamicGIMixedLightMode;
@@ -104,6 +105,7 @@ public SerializedFrameSettings(SerializedProperty rootData, SerializedProperty r
             maximumLODLevel                            = rootData.FindPropertyRelative("maximumLODLevel");
             maximumLODLevelMode                        = rootData.FindPropertyRelative("maximumLODLevelMode");
             maximumLODLevelQualityLevel                = rootData.FindPropertyRelative("maximumLODLevelQualityLevel");
+            probeVolumeEncoding                        = rootData.FindPropertyRelative("probeVolumeEncoding");
             probeVolumeDynamicGIPropagationQuality     = rootData.FindPropertyRelative("probeVolumeDynamicGIPropagationQuality");
             probeVolumeDynamicGIMaxSimulationsPerFrame = rootData.FindPropertyRelative("probeVolumeDynamicGIMaxSimulationsPerFrame");
             probeVolumeDynamicGIMixedLightMode         = rootData.FindPropertyRelative("probeVolumeDynamicGIMixedLightMode");

com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Mesh/PassForward.template

@@ -12,6 +12,7 @@ Pass
 	${VFXHDRPForwardDefines}
 	#pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
 	#pragma multi_compile SHADOW_LOW SHADOW_MEDIUM SHADOW_HIGH
+	#pragma multi_compile PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L1 PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L2
 	#pragma multi_compile _ DEBUG_DISPLAY
 	//#pragma enable_d3d11_debug_symbols
 

com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/PlanarPrimitive/PassForward.template

@@ -13,6 +13,7 @@ Pass
 	${VFXHDRPForwardDefines}
 	#pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
 	#pragma multi_compile SHADOW_LOW SHADOW_MEDIUM SHADOW_HIGH
+	#pragma multi_compile PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L1 PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L2
 	#pragma multi_compile _ DEBUG_DISPLAY
 	//#pragma enable_d3d11_debug_symbols
 

com.unity.render-pipelines.high-definition/Runtime/Lighting/Deferred.shader

@@ -40,6 +40,7 @@ Shader "Hidden/HDRP/Deferred"
             #pragma multi_compile SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON
             #pragma multi_compile _ DEBUG_DISPLAY
             #pragma multi_compile SHADOW_LOW SHADOW_MEDIUM SHADOW_HIGH
+            #pragma multi_compile PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L1 PROBE_VOLUMES_ENCODING_SPHERICAL_HARMONICS_L2
 
             #define USE_FPTL_LIGHTLIST // deferred opaque always use FPTL