[HDRP] Merge HD/bugfix #6387

Author: sebastienlagarde

TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/112_Reflection_AlternativeSGNodes.png

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 - Fixed XR support in CoreUtils.DrawFullscreen function.
+- Fixed an issue causing Render Graph execution errors after a random amount of time.
 
 ## [12.1.2] - 2021-10-22
 

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

@@ -378,6 +378,8 @@ void OnGUI()
             if (GUILayout.Button(Styles.resetButtonContent, EditorStyles.toolbarButton))
             {
                 DebugManager.instance.Reset();
+                DestroyWidgetStates();
+                UpdateWidgetStates();
                 InternalEditorUtility.RepaintAllViews();
             }
 

com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs

@@ -71,7 +71,7 @@ void RefreshEffectListEditor(VolumeProfile asset)
         {
             m_ComponentList.Clear();
 
-            asset.Sanitize();
+            asset?.Sanitize();
 
             if (asset != null)
                 m_ComponentList.Init(asset, new SerializedObject(asset));

com.unity.render-pipelines.core/Editor/Volume/VolumeEditor.cs

@@ -20,11 +20,10 @@ class DebugUpdater : MonoBehaviour
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterSceneLoad)]
         static void RuntimeInit()
         {
-            if (!Debug.isDebugBuild)
-                return;
-
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
             if (DebugManager.instance.enableRuntimeUI)
                 EnableRuntime();
+#endif			
         }
 
         internal static void SetEnabled(bool enabled)

com.unity.render-pipelines.core/Runtime/Debugging/DebugUpdater.cs

@@ -48,14 +48,21 @@ public bool IsValid()
 
         static public void NewFrame(int executionIndex)
         {
+            uint previousValidBit = s_CurrentValidBit;
             // Scramble frame count to avoid collision when wrapping around.
             s_CurrentValidBit = (uint)(((executionIndex >> 16) ^ (executionIndex & 0xffff) * 58546883) << 16);
             // In case the current valid bit is 0, even though perfectly valid, 0 represents an invalid handle, hence we'll
             // trigger an invalid state incorrectly. To account for this, we actually skip 0 as a viable s_CurrentValidBit and
             // start from 1 again.
-            if (s_CurrentValidBit == 0)
+            // In the same spirit, s_SharedResourceValidBit is reserved for shared textures so we should never use it otherwise
+            // resources could be considered valid at frame N+1 (because shared) even though they aren't.
+            if (s_CurrentValidBit == 0 || s_CurrentValidBit == s_SharedResourceValidBit)
             {
-                s_CurrentValidBit = 1 << 16;
+                // We need to make sure we don't pick the same value twice.
+                uint value = 1;
+                while (previousValidBit == (value << 16))
+                    value++;
+                s_CurrentValidBit = (value << 16);
             }
         }
     }

com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResources.cs

@@ -35,7 +35,7 @@ public static bool enabled
         /// <returns>Enumeration of actions</returns>
         public static IEnumerator<Action<RenderTargetIdentifier, CommandBuffer>> GetCaptureActions(Camera camera)
         {
-            if (!actionDict.TryGetValue(camera, out var actions))
+            if (!actionDict.TryGetValue(camera, out var actions) || actions.Count == 0)
                 return null;
 
             return actions.GetEnumerator();

com.unity.render-pipelines.core/Runtime/Utilities/CameraCaptureBridge.cs

@@ -31,6 +31,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed taa jitter for after post process materials (case 1380967).
 - Fixed dirtiness handling in path tracing, when using multiple cameras at once (case 1376940).
 - Fixed flickering / edge aliasing issue when DoF and TAAU or DLSS are enabled (case 1381858).
+- Fixed rasterized accumulation motion blur when DoF is enabled (case 1378497).
+- Fixed light mode not available after switching a light to area "Disc" or "Tube" (case 1372588).
+- Fixed CoC size computation when dynamic resolution is enabled
+- Fixed shadow cascade transition not working properly with bias.
+- Fixed broken rendering when duplicating a camera while the Rendering Debugger is opened.
+- Fixed screen space shadow debug view not showing when no shadows is available.
+- Fixed nullref from debug menu in release build (case 1381556).
+- Fixed debug window reset.
+- Fixed camera bridge action in release build (case 1367866).
+- Fixed contact shadow disappearing when shadowmask is used and no non-static object is available.
+- Fixed atmospheric scattering being incorrectly enabled when scene lighting is disabled.
 
 ## [12.1.2] - 2021-10-22
 

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -227,7 +227,7 @@ static void DrawGeneralContent(SerializedHDLight serialized, Editor owner, bool
             EditorGUI.showMixedValue = false;
 
             // Draw the mode, for Tube and Disc lights, there is only one choice, so we can disable the enum.
-            using (new EditorGUI.DisabledScope(serialized.areaLightShape == AreaLightShape.Tube || serialized.areaLightShape == AreaLightShape.Disc))
+            using (new EditorGUI.DisabledScope(updatedLightType == HDLightType.Area && (serialized.areaLightShape == AreaLightShape.Tube || serialized.areaLightShape == AreaLightShape.Disc)))
                 serialized.settings.DrawLightmapping();
 
             if (updatedLightType == HDLightType.Area)

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

@@ -257,7 +257,7 @@ void EvaluateAtmosphericScattering(PositionInputs posInput, float3 V, out float3
 
 #ifdef DEBUG_DISPLAY
     // Don't sample atmospheric scattering when lighting debug more are enabled so fog is not visible
-    if (_DebugLightingMode >= DEBUGLIGHTINGMODE_DIFFUSE_LIGHTING && _DebugLightingMode <= DEBUGLIGHTINGMODE_EMISSIVE_LIGHTING)
+    if (_DebugLightingMode == DEBUGLIGHTINGMODE_MATCAP_VIEW || (_DebugLightingMode >= DEBUGLIGHTINGMODE_DIFFUSE_LIGHTING && _DebugLightingMode <= DEBUGLIGHTINGMODE_EMISSIVE_LIGHTING))
         return;
 
     if (_DebugShadowMapMode == SHADOWMAPDEBUGMODE_SINGLE_SHADOW || _DebugLightingMode == DEBUGLIGHTINGMODE_LUX_METER || _DebugLightingMode == DEBUGLIGHTINGMODE_LUMINANCE_METER)