Merge Hd/bugfix #5255

Author: sebastienlagarde

com.unity.render-pipelines.core/Editor/Volume/Drawers/IntParameterDrawer.cs

@@ -116,7 +116,8 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
             if (value.propertyType != SerializedPropertyType.LayerMask)
                 return false;
 
-            value.intValue = EditorGUILayout.MaskField(title, value.intValue, InternalEditorUtility.layers);
+            value.intValue = InternalEditorUtility.ConcatenatedLayersMaskToLayerMask(
+                EditorGUILayout.MaskField(title, InternalEditorUtility.LayerMaskToConcatenatedLayersMask(value.intValue), InternalEditorUtility.layers));
             return true;
         }
     }

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

@@ -24,6 +24,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed the FreeCamera and SimpleCameraController mouse rotation unusable at low framerate (case 1340344).
 - Fixed warning "Releasing render texture that is set to be RenderTexture.active!" on pipeline disposal / hdrp live editing.
 - Fixed a nullref in volume system after deleting a volume object (case 1348374).
+- Fixed update order in Graphics Compositor causing jumpy camera updates (case 1345566).
+- Fixed material inspector that allowed setting intensity to an infinite value.
+- Fixed issue when switching between non-persistent cameras when path tarcing is enabled (case 1337843).
+- Fixed issue with the LayerMaskParameter class storing an erroneous mask value (case 1345515).
+- Fixed issue with vertex color defaulting to 0.0 when not defined, in ray/path tracing (case 1348821).
+- Fix issue with a compute dispatch being with 0 threads on extremely small resolutions.
 
 ## [10.6.0] - 2021-04-29
 

com.unity.render-pipelines.high-definition/Documentation~/Decal-Projector.md

@@ -49,8 +49,9 @@ Using the Inspector allows you to change all of the Decal Projector properties,
 
 ## Limitations
 
-- The Decal Projector can affect opaque Materials with either a [Decal Shader](Decal-Shader.md) or a [Decal Master Stack](master-stack-decal.md). However, it can only affect transparent Materials with the [Decal Shader](Decal-Shader.md). 
-- Decal Emissive isn't supported on Transparent Material. 
+- The Decal Projector can affect opaque Materials with either a [Decal Shader](Decal-Shader.md) or a [Decal Master Stack](master-stack-decal.md). However, it can only affect transparent Materials with the [Decal Shader](Decal-Shader.md).
+- Emissive decals isn't supported on Transparent Material.
+- Emissive decals always give an additive positive contribution. This property does not affect the existing emissive properties of the Materials assigned to a GameObject.
 - The **Receive Decals** property of Materials in HDRP does not affect emissive decals. HDRP always renders emissive decals unless you use Decal Layers, which can disable emissive decals on a Layer by Layer basis.
 - If you project a decal onto a transparent surface, HDRP ignores the decal's Texture tiling.
 - In **Project Settings > Graphics**, if **Instancing Variants** is set to **Strip All**, Unity strips the Decal Shader this component references when you build your Project. This happens even if you include the Shader in the **Always Included Shaders** list. If Unity strips the Shader during the build process, the decal does not appear in your built Application.

com.unity.render-pipelines.high-definition/Documentation~/Decal-Shader.md

@@ -15,7 +15,7 @@ These properties allow you to set the affected attributes of the Material the de
 | **Affect Metal**                | Enable the checkbox to make the decal use the metallic property of its **Mask Map**. Otherwise the decal has no metallic effect. Uses the red channel of the **Mask Map**.<br />This property only appears when you enable the **Metal and Ambient Occlusion properties** checkbox in your [HDRP Asset](HDRP-Asset.md#Decals). |
 | **Affect Ambient Occlusion**    | Enable the checkbox to make the decal use the ambient occlusion property of its **Mask Map**. Otherwise the decal has no ambient occlusion effect. Uses the green channel of the **Mask Map**.<br />This property only appears when you enable the **Metal and Ambient Occlusion properties** checkbox in your [HDRP Asset](HDRP-Asset.md#Decals). |
 | **Affect Smoothness**           | Enable the checkbox to make the decal use the smoothness property of its **Mask Map**. Otherwise the decal has no smoothness effect. Uses the alpha channel of the **Mask Map**.<br /> |
-| **Affect Emissive**             | Enable the checkbox to make this decal emissive. When enabled, this Material appears self-illuminated and acts as a visible source of light. This property does not work with transparent receiving Materials. |
+| **Affect Emissive**             | Enable the checkbox to make this decal emissive. When enabled, this Material appears self-illuminated and acts as a visible source of light. This property does not work with transparent receiving Materials. Emissive decals always give an additive positive contribution. This property does not affect the existing emissive properties of the Materials assigned to a GameObject. |
 
 
 ### Surface Inputs

com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/EmissionUIBlock.cs

@@ -11,6 +11,8 @@ namespace UnityEditor.Rendering.HighDefinition
 {
     class EmissionUIBlock : MaterialUIBlock
     {
+        static float s_MaxEvValue = Mathf.Floor(LightUtils.ConvertLuminanceToEv(float.MaxValue));
+
         [Flags]
         public enum Features
         {
@@ -119,7 +121,7 @@ internal static void UpdateEmissiveColorFromIntensityAndEmissiveColorLDR(Materia
 
         internal static void UpdateEmissiveColorLDRFromIntensityAndEmissiveColor(MaterialProperty emissiveColorLDR, MaterialProperty emissiveIntensity, MaterialProperty emissiveColor)
         {
-            Color emissiveColorLDRLinear = emissiveColorLDR.colorValue / emissiveIntensity.floatValue;
+            Color emissiveColorLDRLinear = emissiveColor.colorValue / emissiveIntensity.floatValue;
             emissiveColorLDR.colorValue = emissiveColorLDRLinear.gamma;
         }
 
@@ -183,7 +185,7 @@ void DrawEmissionGUI()
                             {
                                 float evValue = LightUtils.ConvertLuminanceToEv(emissiveIntensity.floatValue);
                                 evValue = EditorGUILayout.FloatField(Styles.emissiveIntensityText, evValue);
-                                newIntensity = Mathf.Clamp(evValue, 0, float.MaxValue);
+                                newIntensity = Mathf.Clamp(evValue, 0, s_MaxEvValue);
                                 emissiveIntensity.floatValue = LightUtils.ConvertEvToLuminance(evValue);
                             }
                             else

com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs

@@ -503,8 +503,8 @@ public void UpdateLayerSetup()
             SetupLayerPriorities();
         }
 
-        // Update is called once per frame
-        void Update()
+        // LateUpdate is called once per frame
+        void LateUpdate()
         {
             // TODO: move all validation calls to onValidate. Before doing it, this needs some extra testing to ensure nothing breaks
             if (enableOutput == false || ValidatePipeline() == false || ValidateAndFixRuntime() == false || RuntimeCheck() == false)

com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl

@@ -9,7 +9,8 @@
 
 #ifndef SCALARIZE_LIGHT_LOOP
 // We perform scalarization only for forward rendering as for deferred loads will already be scalar since tiles will match waves and therefore all threads will read from the same tile.
-// More info on scalarization: https://flashypixels.wordpress.com/2018/11/10/intro-to-gpu-scalarization-part-2-scalarize-all-the-lights/
+// More info on scalarization: https://flashypixels.wordpress.com/2018/11/10/intro-to-gpu-scalarization-part-2-scalarize-all-the-lights/ .
+// Note that it is currently disabled on gamecore platforms for issues with wave intrinsics and the new compiler, it will be soon investigated, but we disable it in the meantime.
 #define SCALARIZE_LIGHT_LOOP (defined(PLATFORM_SUPPORTS_WAVE_INTRINSICS) && !defined(LIGHTLOOP_DISABLE_TILE_AND_CLUSTER) && !defined(SHADER_API_GAMECORE) && SHADERPASS == SHADERPASS_FORWARD)
 #endif
 

com.unity.render-pipelines.high-definition/Runtime/Lighting/LightUtils.cs

@@ -8,6 +8,9 @@ namespace UnityEngine.Rendering.HighDefinition
     /// </summary>
     class LightUtils
     {
+        static float s_LuminanceToEvFactor =  Mathf.Log(100f / ColorUtils.s_LightMeterCalibrationConstant, 2);
+        static float s_EvToLuminanceFactor = -Mathf.Log(100f / ColorUtils.s_LightMeterCalibrationConstant, 2);
+
         // Physical light unit helper
         // All light unit are in lumen (Luminous power)
         // Punctual light (point, spot) are convert to candela (cd = lumens / steradian)
@@ -163,8 +166,7 @@ public static float ConvertCandelaToLux(float candela, float distance)
         /// <returns></returns>
         public static float ConvertEvToLuminance(float ev)
         {
-            float k = ColorUtils.s_LightMeterCalibrationConstant;
-            return (k / 100.0f) * Mathf.Pow(2, ev);
+            return Mathf.Pow(2, ev + s_EvToLuminanceFactor);
         }
 
 
@@ -194,8 +196,7 @@ public static float ConvertEvToLux(float ev, float distance)
         /// <returns></returns>
         public static float ConvertLuminanceToEv(float luminance)
         {
-            float k = ColorUtils.s_LightMeterCalibrationConstant;
-            return (float)Math.Log((luminance * 100f) / k, 2);
+            return Mathf.Log(luminance, 2) + s_LuminanceToEvFactor;
         }
 
         /// <summary>

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

@@ -481,8 +481,8 @@ static void GenerateMaxZ(in GenerateMaxZParameters parameters, RTHandle depthTex
             cmd.SetComputeVectorParam(cs, HDShaderIDs._SrcOffsetAndLimit, srcLimitAndDepthOffset);
             cmd.SetComputeFloatParam(cs, HDShaderIDs._DilationWidth, parameters.dilationWidth);
 
-            int finalMaskW = maskW / 2;
-            int finalMaskH = maskH / 2;
+            int finalMaskW = Mathf.CeilToInt(maskW / 2.0f);
+            int finalMaskH = Mathf.CeilToInt(maskH / 2.0f);
 
             dispatchX = HDUtils.DivRoundUp(finalMaskW, 8);
             dispatchY = HDUtils.DivRoundUp(finalMaskH, 8);

com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.hlsl

@@ -88,10 +88,6 @@ TEXTURE2D_X(_ShadowMaskTexture); // Alias for shadow mask, so we don't need to k
 // If a user do a lighting architecture without material classification, this can be remove
 #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs.hlsl"
 
-// Currently disable SSR until critical editor fix is available
-#undef LIGHTFEATUREFLAGS_SSREFLECTION
-#define LIGHTFEATUREFLAGS_SSREFLECTION 0
-
 // Combination need to be define in increasing "comlexity" order as define by FeatureFlagsToTileVariant
 static const uint kFeatureVariantFlags[NUM_FEATURE_VARIANTS] =
 {