Merge Hd/bugfix #3313

Author: sebastienlagarde

TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity

@@ -37,6 +37,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
+        m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _AffectAO: 1
     - _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
     - _DecalColorMask1: 15
     - _DecalColorMask2: 15
     - _DecalColorMask3: 12
+    - _DecalMeshBiasType: 0
     - _DecalMeshDepthBias: 0
+    - _DecalMeshViewBias: 0
     - _DecalStencilRef: 16
     - _DecalStencilWriteMask: 16
     - _DrawOrder: -2

TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 1.mat

@@ -37,6 +37,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
+        m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _AffectAO: 1
     - _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
     - _DecalColorMask1: 15
     - _DecalColorMask2: 15
     - _DecalColorMask3: 12
+    - _DecalMeshBiasType: 0
     - _DecalMeshDepthBias: 0
+    - _DecalMeshViewBias: 0
     - _DecalStencilRef: 16
     - _DecalStencilWriteMask: 16
     - _DrawOrder: 3

TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 2.mat

@@ -37,6 +37,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
+        m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _AffectAO: 1
     - _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
     - _DecalColorMask1: 15
     - _DecalColorMask2: 15
     - _DecalColorMask3: 12
+    - _DecalMeshBiasType: 0
     - _DecalMeshDepthBias: 0
+    - _DecalMeshViewBias: 0
     - _DecalStencilRef: 16
     - _DecalStencilWriteMask: 16
     - _DrawOrder: 2

TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 3.mat

@@ -37,6 +37,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
+        m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _AffectAO: 1
     - _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
     - _DecalColorMask1: 15
     - _DecalColorMask2: 15
     - _DecalColorMask3: 12
+    - _DecalMeshBiasType: 0
     - _DecalMeshDepthBias: 0
+    - _DecalMeshViewBias: 0
     - _DecalStencilRef: 16
     - _DecalStencilWriteMask: 16
     - _DrawOrder: -2

TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 4.mat

@@ -37,6 +37,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
+        m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _AffectAO: 1
     - _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
     - _DecalColorMask1: 15
     - _DecalColorMask2: 15
     - _DecalColorMask3: 12
+    - _DecalMeshBiasType: 0
     - _DecalMeshDepthBias: 0
+    - _DecalMeshViewBias: 0
     - _DecalStencilRef: 16
     - _DecalStencilWriteMask: 16
     - _DrawOrder: -1

TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal.mat

@@ -41,6 +41,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_22ab0c98da19fa8cb25fd19a0aeeb31b_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 9afbfdeb6447dc74089f286f49995089, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_234b653769274d599f16c88325d2e6ae_Texture_1:
         m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -69,6 +73,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: f23830c1beb532d4a8bf9a720ef56e25, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_922ed2f15209728c934f7ad08e8df067_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_998a067d9ebe483eaf2b10434380d263_Texture_1:
         m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -77,6 +85,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_b38e27eec0c6198ab3dec7c4cf4437e3_Texture_1:
+        m_Texture: {fileID: 2800000, guid: f23830c1beb532d4a8bf9a720ef56e25, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SampleTexture2D_b4b43955db0f4c4b8749459e55a590f4_Texture_1:
         m_Texture: {fileID: 2800000, guid: 9afbfdeb6447dc74089f286f49995089, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -105,6 +117,19 @@ Material:
         m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _AffectAO: 1
     - _AffectAlbedo: 1
@@ -117,7 +142,9 @@ Material:
     - _DecalColorMask1: 15
     - _DecalColorMask2: 15
     - _DecalColorMask3: 12
+    - _DecalMeshBiasType: 0
     - _DecalMeshDepthBias: 0
+    - _DecalMeshViewBias: 0
     - _DecalStencilRef: 16
     - _DecalStencilWriteMask: 16
     - _DrawOrder: 0

TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedMeshDecal.mat

@@ -4,55 +4,7 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-<<<<<<< HEAD
 ## [11.0.0] - 2020-12-02
-=======
-## [12.0.0] - 2021-01-11
-
-### Added
-- Added support for the PlayStation 5 platform.
-
-### Fixed
-- Fixed GC allocations from XR occlusion mesh when using multipass.
-- Fixed XR depth copy when using MSAA.
-- Fixed register spilling on  FXC in light list shaders.
-- Fixed after post process custom pass scale issue when dynamic resolution is enabled (case 1299194).
-- Fixed an issue with light intensity prefab override application not visible in the inspector (case 1299563).
-- Fixed Undo/Redo instability of light temperature.
-- Fixed label style in pbr sky editor.
-- Fixed side effect on styles during compositor rendering.
-- Fixed size and spacing of compositor info boxes (case 1305652).
-- Fixed spacing of UI widgets in the Graphics Compositor (case 1305638).
-- Fixed undo-redo on layered lit editor.
-- Fixed tesselation culling, big triangles using lit tesselation shader would dissapear when camera is too close to them (case 1299116)
-- Fixed issue with compositor related custom passes still active after disabling the compositor (case 1305330)
-- Fixed some render texture leaks.
-- Fixed regression in Wizard that not fix runtime ressource anymore (case 1287627)
-- Fixed error in Depth Of Field near radius blur calculation (case 1306228).
-- Fixed a reload bug when using objects from the scene in the lookdev (case 1300916).
-- Fixed light gizmo showing shadow near plane when shadows are disabled.
-- Fixed path tracing alpha channel support (case 1304187).
-- Fixed shadow matte not working with ambient occlusion when MSAA is enabled
-- Fixed issues with compositor's undo (cases 1305633, 1307170).
-- Fixed wrong shader / properties assignement to materials created from 3DsMax 2021 Physical Material. (case 1293576)
-- Fixed Emissive color property from Autodesk Interactive materials not editable in Inspector. (case 1307234)
-- Fixed exception when changing the current render pipeline to from HDRP to universal (case 1306291).
-- Fixed an issue in shadergraph when switch from a RenderingPass (case 1307653)
-- Fixed LookDev environment library assignement after leaving playmode.
-- Fixed a locale issue with the diffusion profile property values in ShaderGraph on PC where comma is the decimal separator.
-- Fixed error in the RTHandle scale of Depth Of Field when TAA is enabled.
-- Fixed Quality Level set to the last one of the list after a Build (case 1307450)
-- Fixed XR depth copy (case 1286908).
-- Fixed Warnings about "SceneIdMap" missing script in eye material sample scene
-
-### Changed
-- Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356).
-- Change some light unit slider value ranges to better reflect the lighting scenario.
-- Transparent materials created by the Model Importer are set to not cast shadows. ( case 1295747)
-- Change the tooltip for color shadows and semi-transparent shadows (case 1307704).
-
-## [11.0.0] - 2020-10-21
->>>>>>> 39aa6247e5... [HDRP] Update eye sample scene (#3227)
 
 ### Added
 - Added a new API to bake HDRP probes from C# (case 1276360)
@@ -126,7 +78,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed Emissive color property from Autodesk Interactive materials not editable in Inspector. (case 1307234)
 - Fixed Warnings about "SceneIdMap" missing script in eye material sample scene
 - Fixed resize IES when already baked in the Atlas 1299233
-
+- Fixed an exception when opening the color picker in the material UI (case 1307143).
+- Fixed lights shadow frustum near and far planes.
+- Fixed various issues with non-temporal SSAO and rendergraph.
+- Fixed white flashes on camera cuts on volumetric fog.
+- Fixed light layer issue when performing editing on multiple lights.
+- Fixed an issue where selection in a debug panel would reset when cycling through enum items.
+- Fixed material keywords with fbx importer.
+- Fixed lightmaps not working properly with shader graphs in ray traced reflections (case 1305335).
+- Fixed skybox for ortho cameras.
+- Fixed issue when debug full screen 'Transparent Screen Space Reflection' do not take in consideration debug exposure
+ 
 ### Changed
 - Removed the material pass probe volumes evaluation mode.
 - Volume parameter of type Cubemap can now accept Cubemap render textures and custom render textures.
@@ -148,6 +110,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Removed backplate from rendering of lighting cubemap as it did not really work conceptually and caused artefacts.
 - Change some light unit slider value ranges to better reflect the lighting scenario.
 - Transparent materials created by the Model Importer are set to not cast shadows. ( case 1295747)
+- Updated the tooltip for the Decal Angle Fade property (requires to enable Decal Layers in both HDRP asset and Frame settings) (case 1308048).
 
 ## [10.3.0] - 2020-12-01
 

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

@@ -43,6 +43,12 @@ To select TAA for a Camera:
 1. Select the Camera in the Scene view or Hierarchy and view it in the Inspector.
 2. In the General section, select Temporal Anti-aliasing (TAA) from the Anti-aliasing drop-down.
 
+When using the same Camera GameObject for multiple Game Views TAA may not work as expected due to limitations of the history buffer system. Multiple game views using different Cameras will however work as expected.
+
+### Limitations
+In the Editor, if multiple Game views use the same Camera, TAA may not work as expected due to limitations of the history buffer system. However, if you use multiple Game views, where each Game view uses a unique Camera, TAA works as expected.
+
+
 <a name="SMAA"></a>
 
 ## Subpixel morphological anti-aliasing (SMAA)

com.unity.render-pipelines.high-definition/Documentation~/Anti-Aliasing.md

@@ -40,7 +40,7 @@ To create a new Layered Lit Material, navigate to your Project's Asset window, r
 | **Property**                                 | **Description**                                              |
 | -------------------------------------------- | ------------------------------------------------------------ |
 | **Layer Count**                              | Use the slider to set the number of layers this Material uses. You can set up to four layers. |
-| **Layer Mask**                               | Assign a Texture to the field to manage the visibility of each layer. If you do not assign a Texture, the Material uses the maximum value for every channel.<br />&#8226; Alpha channel for the **Main Layer**.<br />&#8226; Red channel for **Layer 1**.<br />&#8226; Green channel for **Layer 2**.<br />&#8226; Blue channel for **Layer** |
+| **Layer Mask**                               | Assign a Texture to the field to manage the visibility of each layer. If you do not assign a Texture, the Material uses the maximum value for every channel.<br />&#8226; Alpha channel for the **Main Layer**.<br />&#8226; Red channel for **Layer 1**.<br />&#8226; Green channel for **Layer 2**.<br />&#8226; Blue channel for **Layer 3**. |
 | **BlendMask UV Mapping**                     | Use the drop-down to select the type of UV mapping that HDRP uses to map the **Layer Mask**.<br />&#8226; Unity manages four UV channels for a vertex: **UV0**, **UV1**, **UV2**, and **UV3**.<br />&#8226; **Planar:** A planar projection from top to bottom.<br />&#8226; **Triplanar**: A planar projection in three directions:X-axis: Left to rightY-axis: Top to bottomZ-axis: Front to back Unity blends these three projections together to produce the final result. |
 | **World Scale**                              | Set the world-space size of the Texture in meters. If you set this to **1**, then HDRP maps the Texture to 1 meter in world space.If you set this to **2**, then HDRP maps the Texture to 0.5 meters in world space.This property only appears when you select **Planar** or **Triplanar** from the **BlendMask UV Mapping** drop-down. |
 | **Tiling**                                   | Set an **X** and **Y** tile rate for the **Layer Mask** UV. HDRP uses the **X** and **Y** values to tile the Texture assigned to the **Layer Mask** across the Material’s surface, in object space. |