Merge branch 'Unity-2017.3' into LightweightPipeline

# Conflicts:
#	ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs

SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_White.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Checker_White
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _DOUBLESIDEDENABLE_OFF _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _DetailNormalMapScale: 1
     - _DetailNormalScale: 1
     - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDstBlend: 1
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 1
-    - _DoubleSidedNormalMode: 1
+    - _DoubleSidedNormalMode: 2
     - _Drag: 1
     - _DstBlend: 0
     - _EmissiveColorMode: 1
+    - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
     - _Parallax: 0.02
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
     - _RoughRefractionEnable: 0
     - _ShiverDirectionality: 0.5
     - _ShiverDrag: 0.2
     - _UVDetail: 0
     - _UVMappingPlanar: 0
     - _UVSec: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
-    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _DoubleSidedConstants: {r: -1, g: -1, b: -1, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}

SampleScenes/HDTest/GraphicTest/Parallax Occlusion Mapping/Material/POM - Rock.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: POM - Rock
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _HEIGHTMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _PER_PIXEL_DISPLACEMENT
+  m_ShaderKeywords: _DISPLACEMENT_LOCK_TILING_SCALE _HEIGHTMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+    _PER_PIXEL_DISPLACEMENT _PER_PIXEL_DISPLACEMENT_OBJECT_SCALE _PER_PIXEL_DISPLACEMENT_TILING_SCALE
+    _PIXEL_DISPLACEMENT _PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE _PIXEL_DISPLACEMENT_LOCK_TILING_SCALE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap:
         m_Texture: {fileID: 2800000, guid: 25f2c87d04c2d19479e747dc71259c7d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DepthOffsetEnable: 0
     - _DetailNormalMapScale: 1
     - _DetailNormalScale: 1
     - _DetailSmoothnessScale: 1
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 2
     - _DistortionDepthTest: 0
     - _DistortionEnable: 0
     - _DistortionOnly: 0
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
     - _EnablePerPixelDisplacement: 1
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
-    - _HeightAmplitude: 0.8
-    - _HeightCenter: 0.5
+    - _HeightAmplitude: 1
+    - _HeightCenter: 1
+    - _HeightMax: 100
+    - _HeightMin: 0
+    - _IOR: 1
+    - _InvTilingScale: 1
     - _MaterialID: 1
     - _Metallic: 0
     - _Mode: 0
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
+    - _PPDPrimitiveLength: 10
+    - _PPDPrimitiveWidth: 10
+    - _PerPixelDisplacementObjectScale: 1
+    - _PerPixelDisplacementTilingScale: 1
+    - _RefractionMode: 0
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _SurfaceType: 0
     - _TexWorldScale: 1
     - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 0.1, g: 0.1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Parallax Occlusion Mapping/Material/POM - Wood triplanar.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: POM - Wood triplanar
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _HEIGHTMAP _MAPPING_TRIPLANAR _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _DEPTHOFFSET_ON _HEIGHTMAP _MAPPING_TRIPLANAR _NORMALMAP _NORMALMAP_TANGENT_SPACE
+    _PER_PIXEL_DISPLACEMENT _PER_PIXEL_DISPLACEMENT_OBJECT_SCALE _PER_PIXEL_DISPLACEMENT_TILING_SCALE
+    _PIXEL_DISPLACEMENT _PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE _PIXEL_DISPLACEMENT_LOCK_TILING_SCALE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap:
         m_Texture: {fileID: 2800000, guid: 927434958f610214aa6a4179f134f5fd, type: 3}
-        m_Scale: {x: 2, y: 2}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
-    - _DepthOffsetEnable: 0
+    - _DepthOffsetEnable: 1
     - _DetailAOScale: 1
     - _DetailAlbedoScale: 1
     - _DetailHeightScale: 1
     - _DetailSmoothnessScale: 1
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 2
     - _DistortionDepthTest: 0
     - _DistortionEnable: 0
     - _DistortionOnly: 0
     - _DstBlend: 0
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
-    - _EnablePerPixelDisplacement: 0
+    - _EnablePerPixelDisplacement: 1
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
-    - _HeightAmplitude: 0.17
+    - _HeightAmplitude: 0.5
+    - _HeightMax: 50
+    - _HeightMin: 0
+    - _IOR: 1
+    - _InvTilingScale: 1
     - _MaterialID: 1
     - _Metallic: 0
     - _Mode: 0
     - _PPDLodThreshold: 5
-    - _PPDMaxSamples: 15
+    - _PPDMaxSamples: 64
+    - _PPDPrimitiveLength: 1
+    - _PPDPrimitiveWidth: 1
+    - _PerPixelDisplacementObjectScale: 1
+    - _PerPixelDisplacementTilingScale: 1
+    - _RefractionMode: 0
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _SubsurfaceRadius: 1
     - _SurfaceType: 0
-    - _TexWorldScale: 0.1
+    - _TexWorldScale: 0.2
-    - _UVBase: 2
+    - _ThicknessMultiplier: 1
+    - _UVBase: 5
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
-    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 0, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Parallax Occlusion Mapping/Material/POM - Wood.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: POM - Wood
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _DEPTHOFFSET_ON _HEIGHTMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
-    _PER_PIXEL_DISPLACEMENT
+  m_ShaderKeywords: _DEPTHOFFSET_ON _DISPLACEMENT_LOCK_TILING_SCALE _HEIGHTMAP _NORMALMAP
+    _NORMALMAP_TANGENT_SPACE _PER_PIXEL_DISPLACEMENT _PER_PIXEL_DISPLACEMENT_OBJECT_SCALE
+    _PER_PIXEL_DISPLACEMENT_TILING_SCALE _PIXEL_DISPLACEMENT _PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE
+    _PIXEL_DISPLACEMENT_LOCK_TILING_SCALE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap:
         m_Texture: {fileID: 2800000, guid: 927434958f610214aa6a4179f134f5fd, type: 3}
-        m_Scale: {x: 2, y: 2}
+        m_Scale: {x: 3, y: 2}
         m_Offset: {x: 0, y: 0}
     - _BentNormalMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _ATDistance: 1
     - _AlbedoAffectEmissive: 0
     - _AlphaCutoff: 0.5
     - _AlphaCutoffEnable: 0
     - _DetailNormalMapScale: 1
     - _DetailNormalScale: 1
     - _DetailSmoothnessScale: 1
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 2
     - _DistortionDepthTest: 0
     - _DistortionEnable: 0
     - _DistortionOnly: 0
     - _EmissiveIntensity: 0
     - _EnablePerPixelDisplacement: 1
     - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _HeightMax: 100
     - _HeightMin: 0
     - _HorizonFade: 1
+    - _IOR: 1
+    - _InvTilingScale: 0.4
     - _MaterialID: 1
     - _Metallic: 0
     - _Mode: 0
     - _PPDLodThreshold: 5
-    - _PPDMaxSamples: 15
+    - _PPDMaxSamples: 64
+    - _PPDPrimitiveLength: 10
+    - _PPDPrimitiveWidth: 10
+    - _PerPixelDisplacementObjectScale: 1
+    - _PerPixelDisplacementTilingScale: 1
+    - _RefractionMode: 0
     - _ShiverDirectionality: 0.5
     - _ShiverDrag: 0.2
     - _Smoothness: 0.5
     - _SurfaceType: 0
     - _TexWorldScale: 0.2
     - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 0.1, g: 0.1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation - Rock.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Tessellation - Rock
   m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3}
-  m_ShaderKeywords: _EMISSIVE_COLOR _HEIGHTMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
-    _TESSELLATION_DISPLACEMENT _TESSELLATION_TILING_SCALE
+  m_ShaderKeywords: _DISPLACEMENT_LOCK_TILING_SCALE _EMISSIVE_COLOR _HEIGHTMAP _NORMALMAP
+    _NORMALMAP_TANGENT_SPACE _TESSELLATION_DISPLACEMENT _TESSELLATION_TILING_SCALE
+    _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE _VERTEX_DISPLACEMENT_LOCK_TILING_SCALE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap:
         m_Texture: {fileID: 2800000, guid: 25f2c87d04c2d19479e747dc71259c7d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DepthOffsetEnable: 0
     - _DetailNormalMapScale: 1
     - _DetailNormalScale: 1
     - _DetailSmoothnessScale: 1
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 3
     - _DistortionDepthTest: 0
     - _DistortionEnable: 0
     - _DistortionOnly: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
     - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
-    - _HeightAmplitude: 0.8
-    - _HeightCenter: 0.5
+    - _HeightAmplitude: 1
+    - _HeightCenter: 1
+    - _HeightMax: 100
+    - _HeightMin: 0
+    - _IOR: 1
+    - _InvTilingScale: 1
     - _MaterialID: 1
     - _Metallic: 0
     - _Mode: 0
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
+    - _PPDPrimitiveLength: 1
+    - _PPDPrimitiveWidth: 1
+    - _RefractionMode: 0
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _TessellationFactorMaxDistance: 50
     - _TessellationFactorMinDistance: 20
     - _TessellationFactorTriangleSize: 100
-    - _TessellationMode: 1
+    - _TessellationMode: 0
+    - _ThicknessMultiplier: 1
     - _UVBase: 0
     - _UVDetail: 0
     - _UVMappingPlanar: 0
     - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation - Wood.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Tessellation - Wood
   m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3}
-  m_ShaderKeywords: _HEIGHTMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _TESSELLATION_DISPLACEMENT
-    _TESSELLATION_OBJECT_SCALE _TESSELLATION_TILING_SCALE
+  m_ShaderKeywords: _DISPLACEMENT_LOCK_TILING_SCALE _HEIGHTMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+    _TESSELLATION_DISPLACEMENT _TESSELLATION_OBJECT_SCALE _TESSELLATION_TILING_SCALE
+    _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE _VERTEX_DISPLACEMENT_LOCK_TILING_SCALE
+    _VERTEX_DISPLACEMENT_OBJECT_SCALE _VERTEX_DISPLACEMENT_TILING_SCALE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap:
         m_Texture: {fileID: 2800000, guid: 927434958f610214aa6a4179f134f5fd, type: 3}
-        m_Scale: {x: 2, y: 2}
+        m_Scale: {x: 3, y: 2}
         m_Offset: {x: 0, y: 0}
     - _BentNormalMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _ATDistance: 1
     - _AlbedoAffectEmissive: 0
     - _AlphaCutoff: 0.5
     - _AlphaCutoffEnable: 0
     - _CoatIOR: 0.5
     - _CullMode: 2
     - _Cutoff: 0.5
-    - _DepthOffsetEnable: 0
+    - _DepthOffsetEnable: 1
     - _DetailAOScale: 1
     - _DetailAlbedoScale: 1
     - _DetailHeightScale: 1
     - _DetailSmoothnessScale: 1
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 3
     - _DistortionDepthTest: 0
     - _DistortionEnable: 0
     - _DistortionOnly: 0
     - _EmissiveIntensity: 0
     - _EnablePerPixelDisplacement: 0
     - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 1
     - _EnableWind: 0
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _HeightMax: 100
     - _HeightMin: 0
     - _HorizonFade: 1
+    - _IOR: 1
+    - _InvTilingScale: 0.4
     - _MaterialID: 1
     - _Metallic: 0
     - _Mode: 0
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 64
     - _PPDMinSamples: 1
+    - _PPDPrimitiveLength: 10
+    - _PPDPrimitiveWidth: 10
+    - _PerPixelDisplacementObjectScale: 1
+    - _PerPixelDisplacementTilingScale: 1
+    - _RefractionMode: 0
     - _ShiverDirectionality: 0.5
     - _ShiverDrag: 0.2
     - _Smoothness: 0.5
     - _TessellationFactorMaxDistance: 50
     - _TessellationFactorMinDistance: 20
     - _TessellationFactorTriangleSize: 100
-    - _TessellationMode: 1
+    - _TessellationMode: 0
-    - _TexWorldScale: 1
+    - _TexWorldScale: 0.2
+    - _ThicknessMultiplier: 1
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 0.1, g: 0.1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Triplanar/Material/Wood triplanar.mat

   m_Name: Wood triplanar
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
   m_ShaderKeywords: _HEIGHTMAP _MAPPING_TRIPLANAR _NORMALMAP _NORMALMAP_TANGENT_SPACE
-    _PER_PIXEL_DISPLACEMENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _BaseColorMap:
         m_Texture: {fileID: 2800000, guid: 927434958f610214aa6a4179f134f5fd, type: 3}
         m_Scale: {x: 2, y: 2}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DepthOffsetEnable: 0
     - _DetailNormalMapScale: 1
     - _DetailNormalScale: 1
     - _DetailSmoothnessScale: 1
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 0
     - _DistortionDepthTest: 0
     - _DistortionEnable: 0
     - _DistortionOnly: 0
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
     - _EnablePerPixelDisplacement: 1
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
-    - _HeightAmplitude: 0.17
+    - _HeightAmplitude: 0.02
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InvTilingScale: 0.5
     - _MaterialID: 1
     - _Metallic: 0
     - _Mode: 0
     - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 1
+    - _PPDPrimitiveLength: 1
+    - _PPDPrimitiveWidth: 1
+    - _RefractionMode: 0
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _SurfaceType: 0
     - _TexWorldScale: 0.1
     - _Thickness: 1
-    - _UVBase: 2
+    - _ThicknessMultiplier: 1
+    - _UVBase: 5
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
-    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 0, g: 0, b: 0, a: 0}

SampleScenes/HDTest/HDRenderLoopTest.unity

   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &113580756
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &192903506
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &269387786
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &476925264
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &563884888
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &580932149
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &682868819
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &710116622
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &726298023
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!114 &733865597
 MonoBehaviour:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!114 &785457128
 MonoBehaviour:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &827169275
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!114 &834722899
 MonoBehaviour:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &858501141
 Light:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 874252441}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 10, y: 1, z: -14}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 12.5, y: 1, z: -16}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_Children:
   - {fileID: 1950745466}
   - {fileID: 122368351}
   m_RootOrder: 13
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!1 &885480687
 GameObject:
   m_ObjectHideFlags: 0
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &903116312
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &970745599
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &990293191
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1013563954
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1046252902
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1063426086
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1083738370
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1085128924
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1148469246
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1161056799
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!114 &1220024537
 MonoBehaviour:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1235762390
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1308071701
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1309651670
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1352160402
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1555751258
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1559142270
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1640077385
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1737381190
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!114 &1854618468
 MonoBehaviour:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1879857774
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1943835614
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1945509647
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1950745469
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &1988224188
 Light:
   maxSmoothness: 1
   applyRangeAttenuation: 1
   useOldInspector: 0
+  featuresFoldout: 1
   showAdditionalSettings: 1
 --- !u!108 &2015022936
 Light:

SampleScenes/OnTileDeferredTest/Common/MobileTestSceneManager.cs

 	int detectSwipe() {
 		if (Input.touchCount == 1 && Input.GetTouch (0).phase == TouchPhase.Ended) {
 			Vector2 endPosition = Input.GetTouch (0).position;
-			Vector2 delta = endPosition - startPosition;
+			//Vector2 delta = endPosition - startPosition;
 
 			if (startPosition.x < endPosition.x)
 				return 1;
 		detectTouchBegan();
 #endif
 
-	}	
+	}
 }

ScriptableRenderPipeline/Core/Debugging/DebugItemHandler.cs

             m_DebugItem = item;
         }
 
-        // Method user needs to override for specific value clamping.
-        public virtual void ClampValues(Func<object> getter, Action<object> setter) {}
+        // Method user needs to override for specific value validation.
+        public virtual void ValidateValues(Func<object> getter, Action<object> setter) {}
         // Method that will create UI items for runtime debug menu.
         public abstract DebugItemUI BuildGUI(GameObject parent);
 
             m_Max = max;
         }
 
-        public override void ClampValues(Func<object> getter, Action<object> setter)
+        public override void ValidateValues(Func<object> getter, Action<object> setter)
         {
             setter(Mathf.Clamp((float)getter(), m_Min, m_Max));
         }
             m_Max = max;
         }
 
-        public override void ClampValues(Func<object> getter, Action<object> setter)
+        public override void ValidateValues(Func<object> getter, Action<object> setter)
         {
             setter(Math.Min(m_Max, Math.Max(m_Min, (uint)getter())));
         }

ScriptableRenderPipeline/Core/Debugging/DebugItemUI.cs

 
         public bool dynamicDisplay { get { return (m_DebugItem.flags & DebugItemFlag.DynamicDisplay) != 0; } }
 
+        public DebugItem debugItem { get { return m_DebugItem; } }
+
         protected DebugItemUI(DebugItem debugItem)
         {
             m_DebugItem = debugItem;

ScriptableRenderPipeline/Core/Debugging/DebugMenuState.cs

 
 namespace UnityEngine.Experimental.Rendering
 {
-    [Serializable]
     public abstract class DebugItemState
         : ScriptableObject
     {
                     if (debugItemState == null)
                     {
                         debugItemState = item.handler.CreateDebugItemState();
-                        debugItemState.hideFlags = HideFlags.DontSave;
-                        debugItemState.Initialize(item);
-                        debugItemState.SetValue(item.GetValue());
-                        AddDebugItemState(debugItemState);
+                        if(debugItemState != null)
+                        {
+                            debugItemState.hideFlags = HideFlags.DontSave;
+                            debugItemState.Initialize(item);
+                            debugItemState.SetValue(item.GetValue());
+                            AddDebugItemState(debugItemState);
+                        }
+                        else
+                        {
+                            Debug.LogWarning(String.Format("DebugItemState for item {0} of type {1} is not provided.\nDid you implement CreateDebugItemState in your custom Handler?", item.name, item.type));
+                        }
                     }
                 }
             }

ScriptableRenderPipeline/Core/Debugging/DebugPanel.cs

             if(m_Setter != null)
             {
                 m_Setter(value);
-                m_Handler.ClampValues(m_Getter, m_Setter);
+                m_Handler.ValidateValues(m_Getter, m_Setter);
             }
 
             if (record && OnItemDirty != null)

ScriptableRenderPipeline/Core/Debugging/DebugPanelUI.cs

                 GameObject.Destroy(child.gameObject);
             }
 
+            m_ItemsUI.Clear();
+
+        protected void AddDebugItemUI(DebugItem item, GameObject parent)
+        {
+#if UNITY_EDITOR
+            // We don't want runtime only items even in the "player" debug menu if we are in the editor.
+            if (item.runtimeOnly)
+                return;
+#endif
+            if(item.editorOnly)
+                return;
+
+            DebugItemUI itemUI = item.handler.BuildGUI(parent);
+            if(itemUI == null)
+            {
+                Debug.LogWarning(String.Format("DebugItemUI not provided for item {0} of type {1}.\n Did you implement BuildGUI for your custom Handler?", item.name, item.type));
+            }
+            else
+            {
+                m_ItemsUI.Add(itemUI);
+            }
+        }
+
-            m_ItemsUI.Clear();
-#if UNITY_EDITOR
-                // We don't want runtime only items even in the "player" debug menu if we are in the editor.
-                if (item.runtimeOnly)
-                    continue;
-#endif
-                if(!item.editorOnly)
-                {
-                    DebugItemHandler handler = item.handler; // Should never be null, we have at least the default handler
-                    m_ItemsUI.Add(handler.BuildGUI(parent));
-                }
+                AddDebugItemUI(item, parent);
             }
         }
 
         {
             if (m_SelectedItem != -1)
             {
-                return m_DebugPanel.GetDebugItem(m_SelectedItem);
+                return m_ItemsUI[m_SelectedItem].debugItem;
             }
 
             return null;
 
         public void OnMoveHorizontal(float value)
         {
-            if (m_SelectedItem != -1 && !m_DebugPanel.GetDebugItem(m_SelectedItem).readOnly)
+            if (m_SelectedItem != -1 && !m_ItemsUI[m_SelectedItem].debugItem.readOnly)
             {
                 if (value > 0.0f)
                     m_ItemsUI[m_SelectedItem].OnIncrement();
 
         public void OnValidate()
         {
-            if (m_SelectedItem != -1 && !m_DebugPanel.GetDebugItem(m_SelectedItem).readOnly)
+            if (m_SelectedItem != -1 && !m_ItemsUI[m_SelectedItem].debugItem.readOnly)
                 m_ItemsUI[m_SelectedItem].OnValidate();
         }
 

ScriptableRenderPipeline/Core/Editor/CoreEditorUtils.cs

-using UnityEngine;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+using UnityEngine;
+        // Serialization helpers
+        public static string FindProperty<T, TValue>(Expression<Func<T, TValue>> expr)
+        {
+            // Get the field path as a string
+            MemberExpression me;
+            switch (expr.Body.NodeType)
+            {
+                case ExpressionType.MemberAccess:
+                    me = expr.Body as MemberExpression;
+                    break;
+                default:
+                    throw new InvalidOperationException();
+            }
+
+            var members = new List<string>();
+            while (me != null)
+            {
+                members.Add(me.Member.Name);
+                me = me.Expression as MemberExpression;
+            }
+
+            var sb = new StringBuilder();
+            for (int i = members.Count - 1; i >= 0; i--)
+            {
+                sb.Append(members[i]);
+                if (i > 0) sb.Append('.');
+            }
+
+            return sb.ToString();
+        }
+
         // UI Helpers
         public static void DrawSplitter()
         {
 
             // Title
             EditorGUI.LabelField(labelRect, title, EditorStyles.boldLabel);
-            EditorGUILayout.Space();
         }
 
         public static bool DrawHeaderFoldout(string title, bool state)

ScriptableRenderPipeline/Core/Editor/PropertyFetcher.cs

 using System;
-using System.Collections.Generic;
-using System.Text;
-    public class PropertyFetcher<T> : IDisposable
+    public sealed class PropertyFetcher<T> : IDisposable
     {
         public readonly SerializedObject obj;
 
             this.obj = obj;
         }
 
-        public SerializedProperty FindProperty(string str)
+        public SerializedProperty Find(string str)
-        public SerializedProperty FindProperty<TValue>(Expression<Func<T, TValue>> expr)
+        public SerializedProperty Find<TValue>(Expression<Func<T, TValue>> expr)
-            // Get the field path as a string
-            MemberExpression me;
-            switch (expr.Body.NodeType)
-            {
-                case ExpressionType.MemberAccess:
-                    me = expr.Body as MemberExpression;
-                    break;
-                default:
-                    throw new InvalidOperationException();
-            }
+            string path = CoreEditorUtils.FindProperty(expr);
+            return obj.FindProperty(path);
+        }
-            var members = new List<string>();
-            while (me != null)
-            {
-                members.Add(me.Member.Name);
-                me = me.Expression as MemberExpression;
-            }
+        public void Dispose()
+        {
+            // Nothing to do here, still needed so we can rely on the using/IDisposable pattern
+        }
+    }
-            var sb = new StringBuilder();
-            for (int i = members.Count - 1; i >= 0; i--)
-            {
-                sb.Append(members[i]);
-                if (i > 0) sb.Append('.');
-            }
+    public sealed class RelativePropertyFetcher<T> : IDisposable
+    {
+        public readonly SerializedProperty obj;
+
+        public RelativePropertyFetcher(SerializedProperty obj)
+        {
+            Assert.IsNotNull(obj);
+            this.obj = obj;
+        }
-            var path = sb.ToString();
+        public SerializedProperty Find(string str)
+        {
+            return obj.FindPropertyRelative(str);
+        }
-            // Fetch the SerializedProperty using Unity's method
-            return obj.FindProperty(path);
+        public SerializedProperty Find<TValue>(Expression<Func<T, TValue>> expr)
+        {
+            string path = CoreEditorUtils.FindProperty(expr);
+            return obj.FindPropertyRelative(path);
         }
 
         public void Dispose()

ScriptableRenderPipeline/Core/ShaderLibrary/BSDF.hlsl

 }
 
 // Ref: Understanding the Masking-Shadowing Function in Microfacet-Based BRDFs, p. 19, 29.
-float G_MaskingSmithGGX(float NdotV, float VdotH, float roughness)
+float G_MaskingSmithGGX(float NdotV, float roughness)
 {
     // G1(V, H)    = HeavisideStep(VdotH) / (1 + Λ(V)).
     // Λ(V)        = -0.5 + 0.5 * sqrt(1 + 1 / a²).
+    // Assume that (VdotH > 0), e.i. (acos(LdotV) < Pi).
-    float hs = VdotH > 0.0 ? 1.0 : 0.0;
-    return hs / (0.5 + 0.5 * sqrt(1.0 + a2 * (1.0 / z2 - 1.0)));
+    return 1 / (0.5 + 0.5 * sqrt(1.0 + a2 * (1.0 / z2 - 1.0)));
-    // Note that we pass 1.0 instead of 'VdotH' since the multiplication will already clamp.
-    return D_GGX(NdotH, roughness) * G_MaskingSmithGGX(NdotV, 1.0, roughness) * VdotH / NdotV;
+    return D_GGX(NdotH, roughness) * G_MaskingSmithGGX(NdotV, roughness) * VdotH / NdotV;
+}
+
+// Precompute part of lambdaV
+float GetSmithJointGGXPreLambdaV(float NdotV, float roughness)
+{
+    float a2 = roughness * roughness;
+    return sqrt((-NdotV * a2 + NdotV) * NdotV + a2);
-float V_SmithJointGGX(float NdotL, float NdotV, float roughness)
+float V_SmithJointGGX(float NdotL, float NdotV, float roughness, float preLambdaV)
+    float a2 = roughness * roughness;
+
-    //  lambda_v    = (-1 + sqrt(a2 * (1 - NdotL2) / NdotL2 + 1)) * 0.5f;
-    //  lambda_l    = (-1 + sqrt(a2 * (1 - NdotV2) / NdotV2 + 1)) * 0.5f;
-    //  G           = 1 / (1 + lambda_v + lambda_l);
+    // lambda_v = (-1 + sqrt(a2 * (1 - NdotL2) / NdotL2 + 1)) * 0.5
+    // lambda_l = (-1 + sqrt(a2 * (1 - NdotV2) / NdotV2 + 1)) * 0.5
+    // G        = 1 / (1 + lambda_v + lambda_l);
-    float a = roughness;
-    float a2 = a * a;
-    // Reorder code to be more optimal
-    float lambdaV = NdotL * sqrt((-NdotV * a2 + NdotV) * NdotV + a2);
+    // Reorder code to be more optimal:
+    float lambdaV = NdotL * preLambdaV;
     float lambdaL = NdotV * sqrt((-NdotL * a2 + NdotL) * NdotL + a2);
 
     // Simplify visibility term: (2.0 * NdotL * NdotV) /  ((4.0 * NdotL * NdotV) * (lambda_v + lambda_l));
-// Precompute part of lambdaV
-float GetSmithJointGGXLambdaV(float NdotV, float roughness)
+float V_SmithJointGGX(float NdotL, float NdotV, float roughness)
-    float a = roughness;
-    float a2 = a * a;
-    return sqrt((-NdotV * a2 + NdotV) * NdotV + a2);
+    float preLambdaV = GetSmithJointGGXPreLambdaV(NdotV, roughness);
+    return V_SmithJointGGX(NdotL, NdotV, roughness, preLambdaV);
-float V_SmithJointGGX(float NdotL, float NdotV, float roughness, float lambdaV)
+// Inline D_GGX() * V_SmithJointGGX() together for better code generation.
+float DV_SmithJointGGX(float NdotH, float NdotL, float NdotV, float roughness, float preLambdaV)
-    float a = roughness;
-    float a2 = a * a;
-    // Reorder code to be more optimal
-    lambdaV *= NdotL;
+    float a2 = roughness * roughness;
+    float  f = (NdotH * a2 - NdotH) * NdotH + 1.0;
+    float2 D = float2(a2, f * f);            // Fraction without the constant (1/Pi)
+
+    float lambdaV = NdotL * preLambdaV;
-    // Simplify visibility term: (2.0 * NdotL * NdotV) /  ((4.0 * NdotL * NdotV) * (lambda_v + lambda_l));
-    return 0.5 / (lambdaV + lambdaL);
+    float2 G = float2(1, lambdaV + lambdaL); // Fraction without the constant (0.5)
+
+    return (INV_PI * 0.5) * (D.x * G.x) / (D.y * G.y);
-float V_SmithJointGGXApprox(float NdotL, float NdotV, float roughness)
+float DV_SmithJointGGX(float NdotH, float NdotL, float NdotV, float roughness)
-    float a = roughness;
-    // Approximation of the above formulation (simplify the sqrt, not mathematically correct but close enough)
-    float lambdaV = NdotL * (NdotV * (1 - a) + a);
-    float lambdaL = NdotV * (NdotL * (1 - a) + a);
-
-    return 0.5 / (lambdaV + lambdaL);
+    float preLambdaV = GetSmithJointGGXPreLambdaV(NdotV, roughness);
+    return DV_SmithJointGGX(NdotH, NdotL, NdotV, roughness, preLambdaV);
-// Precompute part of LambdaV
-float GetSmithJointGGXApproxLambdaV(float NdotV, float roughness)
+// Precompute a part of LambdaV.
+// Note on this linear approximation.
+// Exact for roughness values of 0 and 1. Also, exact when the cosine is 0 or 1.
+// Otherwise, the worst case relative error is around 10%.
+// https://www.desmos.com/calculator/wtp8lnjutx
+float GetSmithJointGGXPreLambdaVApprox(float NdotV, float roughness)
-float V_SmithJointGGXApprox(float NdotL, float NdotV, float roughness, float lambdaV)
+float V_SmithJointGGXApprox(float NdotL, float NdotV, float roughness, float preLambdaV)
-    // Approximation of the above formulation (simplify the sqrt, not mathematically correct but close enough)
-    lambdaV *= NdotL;
+
+    float lambdaV = NdotL * preLambdaV;
+float V_SmithJointGGXApprox(float NdotL, float NdotV, float roughness)
+{
+    float preLambdaV = GetSmithJointGGXPreLambdaVApprox(NdotV, roughness);
+    return V_SmithJointGGXApprox(NdotL, NdotV, roughness, preLambdaV);
+}
+
-    float f = TdotH * TdotH / (roughnessT * roughnessT) + BdotH * BdotH / (roughnessB * roughnessB) + NdotH * NdotH;
+    float aT2 = roughnessT * roughnessT;
+    float aB2 = roughnessB * roughnessB;
+
+    float f = TdotH * TdotH / aT2 + BdotH * BdotH / aB2 + NdotH * NdotH;
     return 1.0 / (roughnessT * roughnessB * f * f);
 }
 
 }
 
+float GetSmithJointGGXAnisoPreLambdaV(float TdotV, float BdotV, float NdotV, float roughnessT, float roughnessB)
+{
+    float aT2 = roughnessT * roughnessT;
+    float aB2 = roughnessB * roughnessB;
+
+    return sqrt(aT2 * TdotV * TdotV + aB2 * BdotV * BdotV + NdotV * NdotV);
+}
+
-float V_SmithJointGGXAniso(float TdotV, float BdotV, float NdotV, float TdotL, float BdotL, float NdotL, float roughnessT, float roughnessB)
+float V_SmithJointGGXAniso(float TdotV, float BdotV, float NdotV, float TdotL, float BdotL, float NdotL, float roughnessT, float roughnessB, float preLambdaV)
-    float aT = roughnessT;
-    float aT2 = aT * aT;
-    float aB = roughnessB;
-    float aB2 = aB * aB;
+    float aT2 = roughnessT * roughnessT;
+    float aB2 = roughnessB * roughnessB;
-    float lambdaV = NdotL * sqrt(aT2 * TdotV * TdotV + aB2 * BdotV * BdotV + NdotV * NdotV);
+    float lambdaV = NdotL * preLambdaV;
-float GetSmithJointGGXAnisoLambdaV(float TdotV, float BdotV, float NdotV, float roughnessT, float roughnessB)
+float V_SmithJointGGXAniso(float TdotV, float BdotV, float NdotV, float TdotL, float BdotL, float NdotL, float roughnessT, float roughnessB)
-    float aT = roughnessT;
-    float aT2 = aT * aT;
-    float aB = roughnessB;
-    float aB2 = aB * aB;
-
-    return sqrt(aT2 * TdotV * TdotV + aB2 * BdotV * BdotV + NdotV * NdotV);
+    float preLambdaV = GetSmithJointGGXAnisoPreLambdaV(TdotV, BdotV, NdotV, roughnessT, roughnessB);
+    return V_SmithJointGGXAniso(TdotV, BdotV, NdotV, TdotL, BdotL, NdotL, roughnessT, roughnessB, preLambdaV);
-float V_SmithJointGGXAnisoLambdaV(float TdotV, float BdotV, float NdotV, float TdotL, float BdotL, float NdotL, float roughnessT, float roughnessB, float lambdaV)
+// Inline D_GGXAniso() * V_SmithJointGGXAniso() together for better code generation.
+float DV_SmithJointGGXAniso(float TdotH, float BdotH, float NdotH,
+                            float TdotV, float BdotV, float NdotV,
+                            float TdotL, float BdotL, float NdotL,
+                            float roughnessT, float roughnessB, float preLambdaV)
-    float aT = roughnessT;
-    float aT2 = aT * aT;
-    float aB = roughnessB;
-    float aB2 = aB * aB;
+    float aT2 = roughnessT * roughnessT;
+    float aB2 = roughnessB * roughnessB;
-    lambdaV *= NdotL;
+    float  f = TdotH * TdotH / aT2 + BdotH * BdotH / aB2 + NdotH * NdotH;
+    float2 D = float2(1, roughnessT * roughnessB * f * f); // Fraction without the constant (1/Pi)
+
+    float lambdaV = NdotL * preLambdaV;
-    return 0.5 / (lambdaV + lambdaL);
+    float2 G = float2(1, lambdaV + lambdaL);               // Fraction without the constant (0.5)
+
+    return (INV_PI * 0.5) * (D.x * G.x) / (D.y * G.y);
+}
+
+float DV_SmithJointGGXAniso(float TdotH, float BdotH, float NdotH,
+                            float TdotV, float BdotV, float NdotV,
+                            float TdotL, float BdotL, float NdotL,
+                            float roughnessT, float roughnessB)
+{
+    float preLambdaV = GetSmithJointGGXAnisoPreLambdaV(TdotV, BdotV, NdotV, roughnessT, roughnessB);
+    return DV_SmithJointGGXAniso(TdotH, BdotH, NdotH,
+                                 TdotV, BdotV, NdotV,
+                                 TdotL, BdotL, NdotL,
+                                 roughnessT, roughnessB, preLambdaV);
 }
 
 //-----------------------------------------------------------------------------
     return INV_PI;
 }
 
-float DisneyDiffuseNoPI(float NdotV, float NdotL, float LdotH, float perceptualRoughness)
+float DisneyDiffuseNoPI(float NdotV, float NdotL, float LdotV, float perceptualRoughness)
-    float fd90 = 0.5 + 2 * LdotH * LdotH * perceptualRoughness;
+    // (2 * LdotH * LdotH) = 1 + LdotV
+    // float fd90 = 0.5 + 2 * LdotH * LdotH * perceptualRoughness;
+    float fd90 = 0.5 + (perceptualRoughness + perceptualRoughness * LdotV);
-    float viewScatter = F_Schlick(1.0, fd90, NdotV);
+    float viewScatter  = F_Schlick(1.0, fd90, NdotV);
-    return lightScatter * viewScatter;
+    // Normalize the BRDF for polar view angles of up to (Pi/4).
+    // We use the worst case of (roughness = albedo = 1), and, for each view angle,
+    // integrate (brdf * cos(theta_light)) over all light directions.
+    // The resulting value is for (theta_view = 0), which is actually a little bit larger
+    // than the value of the integral for (theta_view = Pi/4).
+    // Hopefully, the compiler folds the constant together with (1/Pi).
+    return rcp(1.03571) * (lightScatter * viewScatter);
-float DisneyDiffuse(float NdotV, float NdotL, float LdotH, float perceptualRoughness)
+float DisneyDiffuse(float NdotV, float NdotL, float LdotV, float perceptualRoughness)
-    return INV_PI * DisneyDiffuseNoPI(NdotV, NdotL, LdotH, perceptualRoughness);
+    return INV_PI * DisneyDiffuseNoPI(NdotV, NdotL, LdotV, perceptualRoughness);
-float3 DiffuseGGXNoPI(float3 albedo, float NdotV, float NdotL, float NdotH, float LdotV, float perceptualRoughness)
+float3 DiffuseGGXNoPI(float3 albedo, float NdotV, float NdotL, float NdotH, float LdotV, float roughness)
-    float facing    = 0.5 + 0.5 * LdotV;
-    float rough     = facing * (0.9 - 0.4 * facing) * ((0.5 + NdotH) / NdotH);
+    float facing    = 0.5 + 0.5 * LdotV;              // (LdotH)^2
+    float rough     = facing * (0.9 - 0.4 * facing) * (0.5 / NdotH + 1);
-    float smooth    = transmitL * transmitV * 1.05;             // Normalize F_t over the hemisphere
-    float single    = lerp(smooth, rough, perceptualRoughness); // Rescaled by PI
-    // This constant is picked s.t. setting perceptualRoughness, albedo and all angles to 1
-    // allows us to match the Lambertian and the Disney Diffuse models. Original value: 0.1159.
-    float multiple  = perceptualRoughness * (0.079577 * PI);    // Rescaled by PI
+    float smooth    = transmitL * transmitV * 1.05;   // Normalize F_t over the hemisphere
+    float single    = lerp(smooth, rough, roughness); // Rescaled by PI
+    float multiple  = roughness * (0.1159 * PI);      // Rescaled by PI
-float3 DiffuseGGX(float3 albedo, float NdotV, float NdotL, float NdotH, float LdotV, float perceptualRoughness)
+float3 DiffuseGGX(float3 albedo, float NdotV, float NdotL, float NdotH, float LdotV, float roughness)
-    return INV_PI * DiffuseGGXNoPI(albedo, NdotV, NdotL, NdotH, LdotV, perceptualRoughness);
+    return INV_PI * DiffuseGGXNoPI(albedo, NdotV, NdotL, NdotH, LdotV, roughness);
 }
 
 #endif // UNITY_BSDF_INCLUDED

ScriptableRenderPipeline/Core/ShaderLibrary/Common.hlsl

     return x * x;
 }
 
-// Acos in 14 cycles.
-// Ref: https://seblagarde.wordpress.com/2014/12/01/inverse-trigonometric-functions-gpu-optimization-for-amd-gcn-architecture/
-float FastACos(float inX)
+// Input [0, 1] and output [0, PI/2]
+// 9 VALU
+float FastACosPos(float inX)
+
+    return res;
+}
+
+// Ref: https://seblagarde.wordpress.com/2014/12/01/inverse-trigonometric-functions-gpu-optimization-for-amd-gcn-architecture/
+// Input [-1, 1] and output [0, PI]
+// 12 VALU
+float FastACos(float inX)
+{
+    float res = FastACosPos(inX);
 
     return (inX >= 0) ? res : PI - res; // Undo range reduction
 }

ScriptableRenderPipeline/Core/ShaderLibrary/CommonMaterial.hlsl

 // Convert anisotropic ratio (0->no isotropic; 1->full anisotropy in tangent direction) to roughness
 void ConvertAnisotropyToRoughness(float roughness, float anisotropy, out float roughnessT, out float roughnessB)
 {
-    // (0 <= anisotropy <= 1), therefore (0 <= anisoAspect <= 1)
-    // The 0.9 factor limits the aspect ratio to 10:1.
-    float anisoAspect = sqrt(1.0 - 0.9 * anisotropy);
-
-    roughnessT = roughness / anisoAspect; // Distort along tangent (rougher)
-    roughnessB = roughness * anisoAspect; // Straighten along bitangent (smoother)
+    // Use the parametrization of Sony Imageworks.
+    // Ref: Revisiting Physically Based Shading at Imageworks, p. 15.
+    roughnessT = roughness * (1 + anisotropy);
+    roughnessB = roughness * (1 - anisotropy);
 }
 
 // Ref: Donald Revie - Implementing Fur Using Deferred Shading (GPU Pro 2)
     return cross(B, grainDir);
 }
 
-// Fake anisotropic by distorting the normal.
+// Fake anisotropy by distorting the normal (non-negative anisotropy values only).
 // The grain direction (e.g. hair or brush direction) is assumed to be orthogonal to N.
 // Anisotropic ratio (0->no isotropic; 1->full anisotropy in tangent direction)
 float3 GetAnisotropicModifiedNormal(float3 grainDir, float3 N, float3 V, float anisotropy)

ScriptableRenderPipeline/Core/ShaderLibrary/ImageBasedLighting.hlsl

 // approximating the cone of the specular lobe, and then computing the MIP map level
 // which (approximately) covers the footprint of the lobe with a single texel.
 // Improves the perceptual roughness distribution.
-float PerceptualRoughnessToMipmapLevel(float perceptualRoughness)
+float PerceptualRoughnessToMipmapLevel(float perceptualRoughness, uint mipMapCount)
-    return perceptualRoughness * UNITY_SPECCUBE_LOD_STEPS;
+    return perceptualRoughness * mipMapCount;
+}
+
+float PerceptualRoughnessToMipmapLevel(float perceptualRoughness)
+{
+    return PerceptualRoughnessToMipmapLevel(perceptualRoughness, UNITY_SPECCUBE_LOD_STEPS);
 }
 
 // The *accurate* version of the non-linear remapping. It works by

ScriptableRenderPipeline/Core/ShaderLibrary/PerPixelDisplacement.hlsl

 // it return the offset to apply to the UVSet provide in PerPixelHeightDisplacementParam
 // viewDirTS is view vector in texture space matching the UVSet
 // ref: https://www.gamedev.net/resources/_/technical/graphics-programming-and-theory/a-closer-look-at-parallax-occlusion-mapping-r3262
-float2 ParallaxOcclusionMapping(float lod, float lodThreshold, int numSteps, float3 viewDirTS, float maxHeight, PerPixelHeightDisplacementParam ppdParam, out float outHeight)
+float2 ParallaxOcclusionMapping(float lod, float lodThreshold, int numSteps, float3 viewDirTS, PerPixelHeightDisplacementParam ppdParam, out float outHeight)
-    // TODO: explain this factor! Necessary to achieve parity between tessellation and POM w.r.t. height.
-    maxHeight *= 0.1;
-
     // Convention: 1.0 is top, 0.0 is bottom - POM is always inward, no extrusion
     float stepSize = 1.0 / (float)numSteps;
 
     // float2 parallaxDir = normalize(Out.viewDirTS.xy);
     // float2 parallaxMaxOffsetTS = parallaxDir * parallaxLimit;
     // Above code simplify to
-    float2 parallaxMaxOffsetTS = (viewDirTS.xy / -viewDirTS.z) * maxHeight;
+    float2 parallaxMaxOffsetTS = (viewDirTS.xy / -viewDirTS.z);
     float2 texOffsetPerStep = stepSize * parallaxMaxOffsetTS;
 
     // Do a first step before the loop to init all value correctly
 
     // Secant method to affine the search
     // Ref: Faster Relief Mapping Using the Secant Method - Eric Risser
-    for (int i = 0; i < 5; ++i)
+    for (int i = 0; i < 3; ++i)
     {
         // intersectionHeight is the height [0..1] for the intersection between view ray and heightfield line
         float intersectionHeight = (pt0 * delta1 - pt1 * delta0) / (delta1 - delta0);

ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs

         {
             None = 0,
             Tessellation = DebugViewGbuffer.BakeDiffuseLightingWithAlbedoPlusEmissive + 1,
-            PerPixelDisplacement,
+            PixelDisplacement,
+            TessellationDisplacement,
             DepthOffset,
             Lightmap,
         }

ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs.hlsl

 //
 #define DEBUGVIEWPROPERTIES_NONE (0)
 #define DEBUGVIEWPROPERTIES_TESSELLATION (12)
-#define DEBUGVIEWPROPERTIES_PER_PIXEL_DISPLACEMENT (13)
+#define DEBUGVIEWPROPERTIES_PIXEL_DISPLACEMENT (13)
-#define DEBUGVIEWPROPERTIES_DEPTH_OFFSET (15)
-#define DEBUGVIEWPROPERTIES_LIGHTMAP (16)
+#define DEBUGVIEWPROPERTIES_TESSELLATION_DISPLACEMENT (15)
+#define DEBUGVIEWPROPERTIES_DEPTH_OFFSET (16)
+#define DEBUGVIEWPROPERTIES_LIGHTMAP (17)
 
 //
 // UnityEngine.Experimental.Rendering.HDPipeline.FullScreenDebugMode:  static fields

ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.hlsl

 #endif
             break;
 
-        case DEBUGVIEWPROPERTIES_PER_PIXEL_DISPLACEMENT:
-#ifdef _PER_PIXEL_DISPLACEMENT // Caution: This define is related to a shader features (But it may become a standard features for HD
+        case DEBUGVIEWPROPERTIES_PIXEL_DISPLACEMENT:
+#ifdef _PIXEL_DISPLACEMENT // Caution: This define is related to a shader features (But it may become a standard features for HD)
             result = float3(1.0, 0.0, 0.0);
 #else
             result = float3(0.0, 0.0, 0.0);
         case DEBUGVIEWPROPERTIES_VERTEX_DISPLACEMENT:
-#ifdef _VERTEX_DISPLACEMENT // Caution: This define is related to a shader features (But it may become a standard features for HD
+#ifdef _VERTEX_DISPLACEMENT // Caution: This define is related to a shader features (But it may become a standard features for HD)
+            result = float3(1.0, 0.0, 0.0);
+#else
+            result = float3(0.0, 0.0, 0.0);
+#endif
+            break;
+
+        case DEBUGVIEWPROPERTIES_TESSELLATION_DISPLACEMENT:
+#ifdef _TESSELLATION_DISPLACEMENT // Caution: This define is related to a shader features (But it may become a standard features for HD)
             result = float3(1.0, 0.0, 0.0);
 #else
             result = float3(0.0, 0.0, 0.0);
         case DEBUGVIEWPROPERTIES_DEPTH_OFFSET:
-#ifdef _DEPTHOFFSET_ON  // Caution: This define is related to a shader features (But it may become a standard features for HD
+#ifdef _DEPTHOFFSET_ON  // Caution: This define is related to a shader features (But it may become a standard features for HD)
             result = float3(1.0, 0.0, 0.0);
 #else
             result = float3(0.0, 0.0, 0.0);

ScriptableRenderPipeline/HDRenderPipeline/Debug/LightingDebugPanel.cs

 
         }
 
-        public override void ClampValues(Func<object> getter, Action<object> setter)
+        public override void ValidateValues(Func<object> getter, Action<object> setter)
         {
             HDRenderPipeline hdPipeline = RenderPipelineManager.currentPipeline as HDRenderPipeline;
             m_Max = (uint)hdPipeline.GetShadowAtlasCount() - 1;
 
         }
 
-        public override void ClampValues(Func<object> getter, Action<object> setter)
+        public override void ValidateValues(Func<object> getter, Action<object> setter)
         {
             HDRenderPipeline hdPipeline = RenderPipelineManager.currentPipeline as HDRenderPipeline;
             m_Max = (uint)hdPipeline.GetCurrentShadowCount() - 1;

ScriptableRenderPipeline/HDRenderPipeline/Editor/HDAssetFactory.cs

             instance.gaussianPyramidCS = Load<ComputeShader>(PostProcessingPath + "Shaders/Builtins/GaussianDownsample.compute");
             instance.depthPyramidCS = Load<ComputeShader>(HDRenderPipelinePath + "RenderPipelineResources/DepthDownsample.compute");
             instance.copyChannelCS = Load<ComputeShader>(CorePath + "Resources/GPUCopy.compute");
+            instance.applyDistortionCS = Load<ComputeShader>(HDRenderPipelinePath + "RenderPipelineResources/ApplyDistorsion.compute");
 
             instance.clearDispatchIndirectShader = Load<ComputeShader>(HDRenderPipelinePath + "Lighting/TilePass/cleardispatchindirect.compute");
             instance.buildDispatchIndirectShader = Load<ComputeShader>(HDRenderPipelinePath + "Lighting/TilePass/builddispatchindirect.compute");

ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs

-using System;
-using UnityEditor;
-using UnityEditor.Experimental.Rendering;
-
-//using EditorGUIUtility=UnityEditor.EditorGUIUtility;
+using UnityEngine.Experimental.Rendering;
+using UnityEngine.Experimental.Rendering.HDPipeline;
-namespace UnityEngine.Experimental.Rendering.HDPipeline
+namespace UnityEditor.Experimental.Rendering.HDPipeline
-    public class HDRenderPipelineInspector : Editor
+    public sealed partial class HDRenderPipelineInspector : HDBaseEditor<HDRenderPipelineAsset>
-        private class Styles
-        {
-            public static GUIContent defaults = new GUIContent("Defaults");
-            public static GUIContent defaultDiffuseMaterial = new GUIContent("Default Diffuse Material", "Material to use when creating objects");
-            public static GUIContent defaultShader = new GUIContent("Default Shader", "Shader to use when creating materials");
-
-            public readonly GUIContent settingsLabel = new GUIContent("Settings");
-
-            // Rendering Settings
-            public readonly GUIContent renderingSettingsLabel = new GUIContent("Rendering Settings");
-            public readonly GUIContent useForwardRenderingOnly = new GUIContent("Use Forward Rendering Only");
-            public readonly GUIContent useDepthPrepassWithDeferredRendering = new GUIContent("Use Depth Prepass with Deferred rendering");
-            public readonly GUIContent renderAlphaTestOnlyInDeferredPrepass = new GUIContent("Alpha Test only");
-
-            // Texture Settings
-            public readonly GUIContent textureSettings = new GUIContent("Texture Settings");
-            public readonly GUIContent spotCookieSize = new GUIContent("Spot cookie size");
-            public readonly GUIContent pointCookieSize = new GUIContent("Point cookie size");
-            public readonly GUIContent reflectionCubemapSize = new GUIContent("Reflection cubemap size");
-
-            public readonly GUIContent sssSettings = new GUIContent("Subsurface Scattering Settings");
-
-            // Shadow Settings
-            public readonly GUIContent shadowSettings = new GUIContent("Shadow Settings");
-            public readonly GUIContent shadowsAtlasWidth = new GUIContent("Atlas width");
-            public readonly GUIContent shadowsAtlasHeight = new GUIContent("Atlas height");
-
-            // Subsurface Scattering Settings
-            public readonly GUIContent[] sssProfiles    = new GUIContent[SssConstants.SSS_N_PROFILES - 1] { new GUIContent("Profile #1"), new GUIContent("Profile #2"), new GUIContent("Profile #3"), new GUIContent("Profile #4"), new GUIContent("Profile #5"),
-                                                                                                            new GUIContent("Profile #6"), new GUIContent("Profile #7")/*, new GUIContent("Profile #8"), new GUIContent("Profile #9"), new GUIContent("Profile #10"),
-                                                                                                            new GUIContent("Profile #11"), new GUIContent("Profile #12"), new GUIContent("Profile #13"), new GUIContent("Profile #14"), new GUIContent("Profile #15")*/ };
-            public readonly GUIContent   sssNumProfiles = new GUIContent("Number of profiles");
-
-            // Tile pass Settings
-            public readonly GUIContent tileLightLoopSettings = new GUIContent("Tile Light Loop Settings");
-            public readonly GUIContent enableTileAndCluster = new GUIContent("Enable tile/clustered");
-            public readonly GUIContent enableComputeLightEvaluation = new GUIContent("Enable Compute Light Evaluation");
-            public readonly GUIContent enableComputeLightVariants = new GUIContent("Enable Compute Light Variants");
-            public readonly GUIContent enableComputeMaterialVariants = new GUIContent("Enable Compute Material Variants");
-            public readonly GUIContent enableClustered = new GUIContent("Enable clustered");
-            public readonly GUIContent enableFptlForOpaqueWhenClustered = new GUIContent("Enable Fptl For Opaque When Clustered");
-            public readonly GUIContent enableBigTilePrepass = new GUIContent("Enable big tile prepass");
-            public readonly GUIContent tileDebugByCategory = new GUIContent("Enable Debug By Category");
-
-            // Sky Settings
-            public readonly GUIContent skyParams = new GUIContent("Sky Settings");
-        }
-
-        private static Styles s_Styles = null;
-
-        private static Styles styles
-        {
-            get
-            {
-                if (s_Styles == null)
-                    s_Styles = new Styles();
-                return s_Styles;
-            }
-        }
-
-        private SerializedProperty m_DefaultDiffuseMaterial;
-        private SerializedProperty m_DefaultShader;
+        SerializedProperty m_DefaultDiffuseMaterial;
+        SerializedProperty m_DefaultShader;
 
         // TilePass settings
         SerializedProperty m_enableTileAndCluster;
         SerializedProperty m_enableBigTilePrepass;
 
         // Rendering Settings
-        SerializedProperty m_RenderingUseForwardOnly = null;
-        SerializedProperty m_RenderingUseDepthPrepass = null;
-        SerializedProperty m_RenderingUseDepthPrepassAlphaTestOnly = null;
+        SerializedProperty m_RenderingUseForwardOnly;
+        SerializedProperty m_RenderingUseDepthPrepass;
+        SerializedProperty m_RenderingUseDepthPrepassAlphaTestOnly;
-        // Old SSS Model >>>
-        SerializedProperty m_UseDisneySSS = null;
-        // <<< Old SSS Model
-        SerializedProperty m_Profiles = null;
-        SerializedProperty m_NumProfiles = null;
+        SerializedProperty m_SubsurfaceScatteringSettings;
-        SerializedProperty m_ShadowAtlasWidth = null;
-        SerializedProperty m_ShadowAtlasHeight = null;
+        SerializedProperty m_ShadowAtlasWidth;
+        SerializedProperty m_ShadowAtlasHeight;
-        SerializedProperty m_SpotCookieSize = null;
-        SerializedProperty m_PointCookieSize = null;
-        SerializedProperty m_ReflectionCubemapSize = null;
+        SerializedProperty m_SpotCookieSize;
+        SerializedProperty m_PointCookieSize;
+        SerializedProperty m_ReflectionCubemapSize;
-            using (var p = new PropertyFetcher<HDRenderPipelineAsset>(serializedObject))
-            {
-                m_DefaultDiffuseMaterial = p.FindProperty("m_DefaultDiffuseMaterial");
-                m_DefaultShader = p.FindProperty("m_DefaultShader");
+            m_DefaultDiffuseMaterial = properties.Find("m_DefaultDiffuseMaterial");
+            m_DefaultShader = properties.Find("m_DefaultShader");
-                // Tile settings
-                m_enableTileAndCluster = p.FindProperty(x => x.tileSettings.enableTileAndCluster);
-                m_enableComputeLightEvaluation = p.FindProperty(x => x.tileSettings.enableComputeLightEvaluation);
-                m_enableComputeLightVariants = p.FindProperty(x => x.tileSettings.enableComputeLightVariants);
-                m_enableComputeMaterialVariants = p.FindProperty(x => x.tileSettings.enableComputeMaterialVariants);
-                m_enableClustered = p.FindProperty(x => x.tileSettings.enableClustered);
-                m_enableFptlForOpaqueWhenClustered = p.FindProperty(x => x.tileSettings.enableFptlForOpaqueWhenClustered);
-                m_enableBigTilePrepass = p.FindProperty(x => x.tileSettings.enableBigTilePrepass);
+            // Tile settings
+            m_enableTileAndCluster = properties.Find(x => x.tileSettings.enableTileAndCluster);
+            m_enableComputeLightEvaluation = properties.Find(x => x.tileSettings.enableComputeLightEvaluation);
+            m_enableComputeLightVariants = properties.Find(x => x.tileSettings.enableComputeLightVariants);
+            m_enableComputeMaterialVariants = properties.Find(x => x.tileSettings.enableComputeMaterialVariants);
+            m_enableClustered = properties.Find(x => x.tileSettings.enableClustered);
+            m_enableFptlForOpaqueWhenClustered = properties.Find(x => x.tileSettings.enableFptlForOpaqueWhenClustered);
+            m_enableBigTilePrepass = properties.Find(x => x.tileSettings.enableBigTilePrepass);
-                // Shadow settings
-                m_ShadowAtlasWidth = p.FindProperty(x => x.shadowInitParams.shadowAtlasWidth);
-                m_ShadowAtlasHeight = p.FindProperty(x => x.shadowInitParams.shadowAtlasHeight);
+            // Shadow settings
+            m_ShadowAtlasWidth = properties.Find(x => x.shadowInitParams.shadowAtlasWidth);
+            m_ShadowAtlasHeight = properties.Find(x => x.shadowInitParams.shadowAtlasHeight);
-                // Texture settings
-                m_SpotCookieSize = p.FindProperty(x => x.textureSettings.spotCookieSize);
-                m_PointCookieSize = p.FindProperty(x => x.textureSettings.pointCookieSize);
-                m_ReflectionCubemapSize = p.FindProperty(x => x.textureSettings.reflectionCubemapSize);
+            // Texture settings
+            m_SpotCookieSize = properties.Find(x => x.textureSettings.spotCookieSize);
+            m_PointCookieSize = properties.Find(x => x.textureSettings.pointCookieSize);
+            m_ReflectionCubemapSize = properties.Find(x => x.textureSettings.reflectionCubemapSize);
-                // Rendering settings
-                m_RenderingUseForwardOnly = p.FindProperty(x => x.renderingSettings.useForwardRenderingOnly);
-                m_RenderingUseDepthPrepass = p.FindProperty(x => x.renderingSettings.useDepthPrepassWithDeferredRendering);
-                m_RenderingUseDepthPrepassAlphaTestOnly = p.FindProperty(x => x.renderingSettings.renderAlphaTestOnlyInDeferredPrepass);
+            // Rendering settings
+            m_RenderingUseForwardOnly = properties.Find(x => x.renderingSettings.useForwardRenderingOnly);
+            m_RenderingUseDepthPrepass = properties.Find(x => x.renderingSettings.useDepthPrepassWithDeferredRendering);
+            m_RenderingUseDepthPrepassAlphaTestOnly = properties.Find(x => x.renderingSettings.renderAlphaTestOnlyInDeferredPrepass);
-                // Subsurface Scattering Settings
-                // Old SSS Model >>>
-                m_UseDisneySSS = p.FindProperty(x => x.sssSettings.useDisneySSS);
-                // <<< Old SSS Model
-                m_Profiles    = p.FindProperty(x => x.sssSettings.profiles);
-                m_NumProfiles = m_Profiles.FindPropertyRelative("Array.size");
-            }
+            // Subsurface Scattering Settings
+            m_SubsurfaceScatteringSettings = properties.Find(x => x.sssSettings);
         }
 
         static void HackSetDirty(RenderPipelineAsset asset)
                 method.Invoke(asset, new object[0]);
         }
 
-        private void TileSettingsUI(HDRenderPipelineAsset renderContext)
+        void TileSettingsUI(HDRenderPipelineAsset renderContext)
-            EditorGUILayout.LabelField(styles.tileLightLoopSettings);
+            EditorGUILayout.LabelField(s_Styles.tileLightLoopSettings);
-            EditorGUILayout.PropertyField(m_enableTileAndCluster, styles.enableTileAndCluster);
+            EditorGUILayout.PropertyField(m_enableTileAndCluster, s_Styles.enableTileAndCluster);
-                EditorGUILayout.PropertyField(m_enableBigTilePrepass, styles.enableBigTilePrepass);
-                EditorGUILayout.PropertyField(m_enableClustered, styles.enableClustered);
+                EditorGUILayout.PropertyField(m_enableBigTilePrepass, s_Styles.enableBigTilePrepass);
+                EditorGUILayout.PropertyField(m_enableClustered, s_Styles.enableClustered);
 
                 // Tag: SUPPORT_COMPUTE_CLUSTER_OPAQUE - Uncomment this if you want to do cluster opaque with compute shader (by default we support only fptl on opaque)
                 // if (m_enableClustered.boolValue)
-                    EditorGUILayout.PropertyField(m_enableFptlForOpaqueWhenClustered, styles.enableFptlForOpaqueWhenClustered);
+                    EditorGUILayout.PropertyField(m_enableFptlForOpaqueWhenClustered, s_Styles.enableFptlForOpaqueWhenClustered);
-                EditorGUILayout.PropertyField(m_enableComputeLightEvaluation, styles.enableComputeLightEvaluation);
+                EditorGUILayout.PropertyField(m_enableComputeLightEvaluation, s_Styles.enableComputeLightEvaluation);
                 if (m_enableComputeLightEvaluation.boolValue)
                 {
                     // Tag: SUPPORT_COMPUTE_CLUSTER_OPAQUE - Uncomment this if you want to do cluster opaque with compute shader (by default we support only fptl on opaque)
-                    EditorGUILayout.PropertyField(m_enableComputeLightVariants, styles.enableComputeLightVariants);
-                    EditorGUILayout.PropertyField(m_enableComputeMaterialVariants, styles.enableComputeMaterialVariants);
+                    EditorGUILayout.PropertyField(m_enableComputeLightVariants, s_Styles.enableComputeLightVariants);
+                    EditorGUILayout.PropertyField(m_enableComputeMaterialVariants, s_Styles.enableComputeMaterialVariants);
-
 
             if (EditorGUI.EndChangeCheck())
             {
         }
 
-        private void SssSettingsUI(HDRenderPipelineAsset renderContext)
+        void SssSettingsUI(HDRenderPipelineAsset renderContext)
-            EditorGUILayout.Space();
-
-            EditorGUILayout.LabelField(styles.sssSettings);
-            EditorGUI.BeginChangeCheck();
-            EditorGUI.indentLevel++;
-
-            EditorGUI.BeginChangeCheck();
-
-            // Old SSS Model >>>
-            EditorGUI.BeginChangeCheck();
-            EditorGUILayout.PropertyField(m_UseDisneySSS);
-            if (EditorGUI.EndChangeCheck())
-            {
-                HDRenderPipeline hdPipeline = RenderPipelineManager.currentPipeline as HDRenderPipeline;
-                hdPipeline.CreateSssMaterials(m_UseDisneySSS.boolValue);
-            }
-            // <<< Old SSS Model
-            EditorGUILayout.PropertyField(m_NumProfiles, styles.sssNumProfiles);
-
-            for (int i = 0, n = m_Profiles.arraySize; i < n; i++)
-            {
-                SerializedProperty profile = m_Profiles.GetArrayElementAtIndex(i);
-                EditorGUILayout.PropertyField(profile, styles.sssProfiles[i]);
-            }
-
-            EditorGUI.indentLevel--;
+            EditorGUILayout.PropertyField(m_SubsurfaceScatteringSettings, s_Styles.sssSettings);
-        private void SettingsUI(HDRenderPipelineAsset renderContext)
+        void SettingsUI(HDRenderPipelineAsset renderContext)
-            EditorGUILayout.LabelField(styles.settingsLabel);
+            EditorGUILayout.LabelField(s_Styles.settingsLabel, EditorStyles.boldLabel);
             EditorGUI.indentLevel++;
 
             SssSettingsUI(renderContext);
             EditorGUI.indentLevel--;
         }
 
-        private void ShadowSettingsUI(HDRenderPipelineAsset renderContext)
+        void ShadowSettingsUI(HDRenderPipelineAsset renderContext)
-            EditorGUILayout.LabelField(styles.shadowSettings);
+            EditorGUILayout.LabelField(s_Styles.shadowSettings);
-            EditorGUILayout.PropertyField(m_ShadowAtlasWidth, styles.shadowsAtlasWidth);
-            EditorGUILayout.PropertyField(m_ShadowAtlasHeight, styles.shadowsAtlasHeight);
+            EditorGUILayout.PropertyField(m_ShadowAtlasWidth, s_Styles.shadowsAtlasWidth);
+            EditorGUILayout.PropertyField(m_ShadowAtlasHeight, s_Styles.shadowsAtlasHeight);
 
             if (EditorGUI.EndChangeCheck())
             {
         }
 
-        private void RendereringSettingsUI(HDRenderPipelineAsset renderContext)
+        void RendereringSettingsUI(HDRenderPipelineAsset renderContext)
-            EditorGUILayout.LabelField(styles.renderingSettingsLabel);
+            EditorGUILayout.LabelField(s_Styles.renderingSettingsLabel);
-            EditorGUILayout.PropertyField(m_RenderingUseForwardOnly, styles.useForwardRenderingOnly);
+            EditorGUILayout.PropertyField(m_RenderingUseForwardOnly, s_Styles.useForwardRenderingOnly);
-                EditorGUILayout.PropertyField(m_RenderingUseDepthPrepass, styles.useDepthPrepassWithDeferredRendering);
+                EditorGUILayout.PropertyField(m_RenderingUseDepthPrepass, s_Styles.useDepthPrepassWithDeferredRendering);
-                    EditorGUILayout.PropertyField(m_RenderingUseDepthPrepassAlphaTestOnly, styles.renderAlphaTestOnlyInDeferredPrepass);
+                    EditorGUILayout.PropertyField(m_RenderingUseDepthPrepassAlphaTestOnly, s_Styles.renderAlphaTestOnlyInDeferredPrepass);
                     EditorGUI.indentLevel--;
                 }
             }
 
-        private void TextureSettingsUI(HDRenderPipelineAsset renderContext)
+        void TextureSettingsUI(HDRenderPipelineAsset renderContext)
-            EditorGUILayout.LabelField(styles.textureSettings);
+            EditorGUILayout.LabelField(s_Styles.textureSettings);
-            EditorGUILayout.PropertyField(m_SpotCookieSize, styles.spotCookieSize);
-            EditorGUILayout.PropertyField(m_PointCookieSize, styles.pointCookieSize);
-            EditorGUILayout.PropertyField(m_ReflectionCubemapSize, styles.reflectionCubemapSize);
+            EditorGUILayout.PropertyField(m_SpotCookieSize, s_Styles.spotCookieSize);
+            EditorGUILayout.PropertyField(m_PointCookieSize, s_Styles.pointCookieSize);
+            EditorGUILayout.PropertyField(m_ReflectionCubemapSize, s_Styles.reflectionCubemapSize);
 
             if (EditorGUI.EndChangeCheck())
             {
         }
 
-        public void OnEnable()
+        protected override void OnEnable()
+            base.OnEnable();
+
-            var renderContext = target as HDRenderPipelineAsset;
-            HDRenderPipeline renderpipeline = UnityEngine.Experimental.Rendering.RenderPipelineManager.currentPipeline as HDRenderPipeline;
-
-            if (!renderContext || renderpipeline == null)
+            if (!m_Target || m_HDPipeline == null)
+            CheckStyles();
+
-            EditorGUILayout.LabelField(Styles.defaults, EditorStyles.boldLabel);
+            EditorGUILayout.LabelField(s_Styles.defaults, EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(m_DefaultDiffuseMaterial, Styles.defaultDiffuseMaterial);
-            EditorGUILayout.PropertyField(m_DefaultShader, Styles.defaultShader);
+            EditorGUILayout.PropertyField(m_DefaultDiffuseMaterial, s_Styles.defaultDiffuseMaterial);
+            EditorGUILayout.PropertyField(m_DefaultShader, s_Styles.defaultShader);
+            EditorGUILayout.Space();
-            SettingsUI(renderContext);
+            SettingsUI(m_Target);
 
             serializedObject.ApplyModifiedProperties();
         }

ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs

             }
         }
 
-        class DoCreateNewAssetSSSProfile : DoCreateNewAsset<SubsurfaceScatteringProfile> {}
-
-        [MenuItem("Assets/Create/HDRenderPipeline/Subsurface Scattering Profile", priority = 666)]
-        static void MenuCreateSubsurfaceScatteringProfile()
-        {
-            var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon");
-            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<DoCreateNewAssetSSSProfile>(), "New SSS Profile.asset", icon, null);
-        }
+        class DoCreateNewAssetSubsurfaceScatteringSettings : DoCreateNewAsset<SubsurfaceScatteringSettings> {}
 
         [MenuItem("Assets/Create/HDRenderPipeline/Common Settings", priority = 677)]
         static void MenuCreateCommonSettings()
         {
             var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon");
             ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<DoCreateNewAssetSSAOSettings>(), "New AmbientOcclusionSettings.asset", icon, null);
+        }
+
+        [MenuItem("Assets/Create/HDRenderPipeline/Subsurface Scattering Settings", priority = 681)]
+        static void MenuCreateSubsurfaceScatteringSettings()
+        {
+            var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon");
+            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<DoCreateNewAssetSubsurfaceScatteringSettings>(), "New SSS Settings.asset", icon, null);
         }
     }
 }

ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs

         RenderTargetIdentifier m_HTileRT;
 
         // The pass "SRPDefaultUnlit" is a fallback to legacy unlit rendering and is required to support unity 2d + unity UI that render in the scene.
-        ShaderPassName[] m_ForwardPassNames = { new ShaderPassName(), HDShaderPassNames.s_SRPDefaultUnlitName};
+        ShaderPassName[] m_ForwardAndForwardOnlyPassNames = { new ShaderPassName(), new ShaderPassName(), HDShaderPassNames.s_SRPDefaultUnlitName};
+        ShaderPassName[] m_ForwardOnlyPassNames = { new ShaderPassName(), HDShaderPassNames.s_SRPDefaultUnlitName};
+        ShaderPassName[] m_DepthOnlyAndDepthForwardOnlyPassNames = { HDShaderPassNames.s_DepthForwardOnlyName, HDShaderPassNames.s_DepthOnlyName };
+        ShaderPassName[] m_DepthForwardOnlyPassNames = { HDShaderPassNames.s_DepthForwardOnlyName };
+        ShaderPassName[] m_DepthOnlyPassNames = { HDShaderPassNames.s_DepthOnlyName };
         ShaderPassName[] m_ForwardErrorPassNames = { HDShaderPassNames.s_AlwaysName, HDShaderPassNames.s_ForwardBaseName, HDShaderPassNames.s_DeferredName, HDShaderPassNames.s_PrepassBaseName, HDShaderPassNames.s_VertexName, HDShaderPassNames.s_VertexLMRGBMName, HDShaderPassNames.s_VertexLMName };
         ShaderPassName[] m_SinglePassName = new ShaderPassName[1];
 
         int m_DebugFullScreenTempRT;
         bool m_FullScreenDebugPushed;
 
+        SubsurfaceScatteringSettings m_InternalSSSAsset;
-            get { return m_Asset.sssSettings; }
+            get
+            {
+                // If no SSS asset is set, build / reuse an internal one for simplicity
+                var asset = m_Asset.sssSettings;
+
+                if (asset == null)
+                {
+                    if (m_InternalSSSAsset == null)
+                        m_InternalSSSAsset = ScriptableObject.CreateInstance<SubsurfaceScatteringSettings>();
+
+                    asset = m_InternalSSSAsset;
+                }
+
+                return asset;
+            }
         }
 
         CommonSettings.Settings m_CommonSettings = CommonSettings.Settings.s_Defaultsettings;
             m_CameraFilteringBuffer            = HDShaderIDs._CameraFilteringBuffer;
             m_CameraFilteringBufferRT          = new RenderTargetIdentifier(m_CameraFilteringBuffer);
 
-            CreateSssMaterials(sssSettings.useDisneySSS);
+            CreateSssMaterials();
 
             m_CopyStencilForSplitLighting   = CoreUtils.CreateEngineMaterial("Hidden/HDRenderPipeline/CopyStencilBuffer");
             m_CopyStencilForSplitLighting.EnableKeyword("EXPORT_HTILE");
                 autoGenerateMips = false
             };
 
-            m_DistortionBuffer = HDShaderIDs._DistortionTexture;
-            m_DistortionBufferRT = new RenderTargetIdentifier(m_DistortionBuffer);
-
             m_DeferredShadowBuffer = HDShaderIDs._DeferredShadowTexture;
             m_DeferredShadowBufferRT = new RenderTargetIdentifier(m_DeferredShadowBuffer);
 
             m_ErrorMaterial = CoreUtils.CreateEngineMaterial("Hidden/InternalErrorShader");
         }
 
-        public void CreateSssMaterials(bool useDisneySSS)
+        public void CreateSssMaterials()
         {
             m_SubsurfaceScatteringKernel = m_SubsurfaceScatteringCS.FindKernel("SubsurfaceScattering");
 
             CoreUtils.Destroy(m_DebugDisplayLatlong);
             CoreUtils.Destroy(m_DebugFullScreen);
             CoreUtils.Destroy(m_ErrorMaterial);
+            CoreUtils.Destroy(m_InternalSSSAsset);
 
             m_SkyManager.Cleanup();
 
 
             var postProcessLayer = camera.GetComponent<PostProcessLayer>();
             var hdCamera = HDCamera.Get(camera, postProcessLayer);
-            PushGlobalParams(hdCamera, cmd, m_Asset.sssSettings);
+            PushGlobalParams(hdCamera, cmd, sssSettings);
 
             // TODO: Find a correct place to bind these material textures
             // We have to bind the material specific global parameters in this mode
                 using (new ProfilingSample(cmd, "Build Light list and render shadows"))
                 {
                     // TODO: Everything here (SSAO, Shadow, Build light list, deffered shadow, material and light classification can be parallelize with Async compute)
-                    m_SsaoEffect.Render(ssaoSettingsToUse, this, hdCamera, renderContext, cmd, m_Asset.renderingSettings.useForwardRenderingOnly);
+
+                    if (ssaoSettingsToUse.enable)
+                    {
+                        // Override v2's MSVO if the internal default one is enabled
+                        m_SsaoEffect.Render(ssaoSettingsToUse, this, hdCamera, renderContext, cmd, m_Asset.renderingSettings.useForwardRenderingOnly);
+                    }
+                    else if (postProcessLayer != null)
+                    {
+                        var settings = postProcessLayer.GetSettings<AmbientOcclusion>();
+
+                        if (settings.IsEnabledAndSupported(null))
+                        {
+                            cmd.GetTemporaryRT(HDShaderIDs._AmbientOcclusionTexture, new RenderTextureDescriptor(camera.pixelWidth, camera.pixelHeight, RenderTextureFormat.R8, 0)
+                            {
+                                sRGB = false,
+                                enableRandomWrite = true
+                            }, FilterMode.Bilinear);
+                            postProcessLayer.BakeMSVOMap(cmd, camera, HDShaderIDs._AmbientOcclusionTexture, GetDepthTexture(), true);
+                            cmd.SetGlobalFloat(HDShaderIDs._AmbientOcclusionDirectLightStrenght, settings.directLightingStrength.value);
+                            PushFullScreenDebugTexture(cmd, HDShaderIDs._AmbientOcclusionTexture, camera, renderContext, FullScreenDebugMode.SSAO);
+
+                            // AO color is available at:
+                            //  settings.color.value
+                        }
+                        else
+                        {
+                            cmd.SetGlobalTexture(HDShaderIDs._AmbientOcclusionTexture, RuntimeUtilities.blackTexture); // Neutral is black, see the comment in the shaders
+                            cmd.SetGlobalFloat(HDShaderIDs._AmbientOcclusionDirectLightStrenght, 0f);
+                        }
+                    }
+
                     m_LightLoop.PrepareLightsForGPU(m_ShadowSettings, m_CullResults, camera);
                     m_LightLoop.RenderShadows(renderContext, cmd, m_CullResults);
 
                 // We compute subsurface scattering here. Therefore, no objects rendered afterwards will exhibit SSS.
                 // Currently, there is no efficient way to switch between SRT and MRT for the forward pass;
                 // therefore, forward-rendered objects do not output split lighting required for the SSS pass.
-                SubsurfaceScatteringPass(hdCamera, cmd, m_Asset.sssSettings);
+                SubsurfaceScatteringPass(hdCamera, cmd, sssSettings);
 
                 RenderForward(m_CullResults, camera, renderContext, cmd, true);
                 RenderForwardError(m_CullResults, camera, renderContext, cmd, true);
                 {
                     RenderVelocity(m_CullResults, hdCamera, renderContext, cmd); // Note we may have to render velocity earlier if we do temporalAO, temporal volumetric etc... Mean we will not take into account forward opaque in case of deferred rendering ?
 
+                    RenderGaussianPyramidColor(camera, cmd);
+
-                    // Instead we chose to apply distortion at the end after we cumulate distortion vector and desired blurriness. This
-                    RenderDistortion(m_CullResults, camera, renderContext, cmd);
+                    // Instead we chose to apply distortion at the end after we cumulate distortion vector and desired blurriness.
+                    AccumulateDistortion(m_CullResults, camera, renderContext, cmd);
+                    RenderDistortion(cmd, m_Asset.renderPipelineResources);
 
                     RenderPostProcesses(camera, cmd, postProcessLayer);
                 }
                 renderContext.DrawRenderers(cull.visibleRenderers, ref drawSettings, filterSettings, stateBlock.Value);
         }
 
+        void AccumulateDistortion(CullResults cullResults, Camera camera, ScriptableRenderContext renderContext, CommandBuffer cmd)
+        {
+            if (!m_CurrentDebugDisplaySettings.renderingDebugSettings.enableDistortion)
+                return;
+
+            using (new ProfilingSample(cmd, "Distortion"))
+            {
+                int w = camera.pixelWidth;
+                int h = camera.pixelHeight;
+
+                cmd.GetTemporaryRT(m_DistortionBuffer, w, h, 0, FilterMode.Point, Builtin.GetDistortionBufferFormat(), Builtin.GetDistortionBufferReadWrite());
+                cmd.SetRenderTarget(m_DistortionBufferRT, m_CameraDepthStencilBufferRT);
+                cmd.ClearRenderTarget(false, true, Color.clear);
+
+                // Only transparent object can render distortion vectors
+                RenderTransparentRenderList(cullResults, camera, renderContext, cmd, HDShaderPassNames.s_DistortionVectorsName);
+            }
+        }
+
+        void RenderDistortion(CommandBuffer cmd, RenderPipelineResources resources)
+        {
+            using (new ProfilingSample(cmd, "ApplyDistortion"))
+            {
+                var size = new Vector4(m_CurrentWidth, m_CurrentHeight, 1f / m_CurrentWidth, 1f / m_CurrentHeight);
+                uint x, y, z;
+                resources.applyDistortionCS.GetKernelThreadGroupSizes(resources.applyDistortionKernel, out x, out y, out z);
+                cmd.SetComputeTextureParam(resources.applyDistortionCS, resources.applyDistortionKernel, HDShaderIDs._DistortionTexture, m_DistortionBufferRT);
+                cmd.SetComputeTextureParam(resources.applyDistortionCS, resources.applyDistortionKernel, HDShaderIDs._GaussianPyramidColorTexture, m_GaussianPyramidColorBufferRT);
+                cmd.SetComputeTextureParam(resources.applyDistortionCS, resources.applyDistortionKernel, HDShaderIDs._CameraColorTexture, m_CameraColorBufferRT);
+                cmd.SetComputeTextureParam(resources.applyDistortionCS, resources.applyDistortionKernel, HDShaderIDs._DepthTexture, GetDepthTexture());
+                cmd.SetComputeVectorParam(resources.applyDistortionCS, HDShaderIDs._Size, size);
+                cmd.SetComputeVectorParam(resources.applyDistortionCS, HDShaderIDs._ZBufferParams, Shader.GetGlobalVector(HDShaderIDs._ZBufferParams));
+                cmd.SetComputeVectorParam(resources.applyDistortionCS, HDShaderIDs._GaussianPyramidColorMipSize, Shader.GetGlobalVector(HDShaderIDs._GaussianPyramidColorMipSize));
+
+                cmd.DispatchCompute(resources.applyDistortionCS, resources.applyDistortionKernel, Mathf.CeilToInt(size.x / x), Mathf.CeilToInt(size.y / y), 1);
+            }
+        }
+
-        // Forward opaque with deferred renderer (ForwardOnlyOpaqueDepthOnly pass): We always render everything
+        // Forward opaque with deferred renderer (DepthForwardOnly pass): We always render everything
-            // Guidelines: To be able to switch from deferred to forward renderer we need to have forward opaque material with both DepthOnly and ForwardOnlyOpaqueDepthOnly pass.
-            // This is also required if we want to support optional depth prepass dynamically.
-            // This is what is assume here. But users may want to reduce number of shader combination once they have made their choice.
+            // In case of deferred renderer, we can have forward opaque material. These materials need to be render in the depth buffer to correctly build the light list.
+            // And they will tag the stencil to not be lit during the deferred lighting pass.
-            // In case of forward only renderer we have a depth prepass. In case of deferred renderer, it is optional
-            bool addDepthPrepass = m_Asset.renderingSettings.ShouldUseForwardRenderingOnly() || m_Asset.renderingSettings.useDepthPrepassWithDeferredRendering;
-            // In case of deferred renderer, we can have forward opaque material. These materials need to be render in the depth buffer to correctly build the light list. And they will tag the stencil to not be lit during the deferred lighting pass.
-            // Caution: If a DepthPrepass is enabled for deferred then the object will be rendered with the pass DepthPrepass. See guidelines. This allow to switch dynamically between both mode.
-            // So we don't need to render the ForwardOnlyOpaqueDepthOnly pass
-            // Note that an object can't be in both list
-            bool addForwardOnlyOpaqueDepthPrepass = !m_Asset.renderingSettings.ShouldUseForwardRenderingOnly() && !m_Asset.renderingSettings.useDepthPrepassWithDeferredRendering;
+            // Guidelines: In deferred by default there is no opaque in forward. However it is possible to force an opaque material to render in forward
+            // by using the pass "ForwardOnly". In this case the .shader should not have "Forward" but only a "ForwardOnly" pass.
+            // It must also have a "DepthForwardOnly" and no "DepthOnly" pass as forward material (either deferred or forward only rendering) have always a depth pass.
-            if (addDepthPrepass == false && addForwardOnlyOpaqueDepthPrepass == false)
-                return;
+            // In case of forward only rendering we have a depth prepass. In case of deferred renderer, it is optional
+            bool addFullDepthPrepass = m_Asset.renderingSettings.ShouldUseForwardRenderingOnly() || m_Asset.renderingSettings.useDepthPrepassWithDeferredRendering;
+            bool addAlphaTestedOnly = !m_Asset.renderingSettings.ShouldUseForwardRenderingOnly() && m_Asset.renderingSettings.useDepthPrepassWithDeferredRendering && m_Asset.renderingSettings.renderAlphaTestOnlyInDeferredPrepass;
-            using (new ProfilingSample(cmd, addDepthPrepass ? "Depth Prepass" : "Depth Prepass forward opaque"))
+            using (new ProfilingSample(cmd, addAlphaTestedOnly ? "Depth Prepass alpha test" : "Depth Prepass"))
-                // Default depth prepass (forward and deferred) will render all opaque geometry.
-                var renderQueueRange = RenderQueueRange.opaque;
-                // If we want only alpha tested geometry in prepass for deferred we change the RenderQueueRange
-                if (!m_Asset.renderingSettings.ShouldUseForwardRenderingOnly() && m_Asset.renderingSettings.useDepthPrepassWithDeferredRendering && m_Asset.renderingSettings.renderAlphaTestOnlyInDeferredPrepass)
-                    renderQueueRange = new RenderQueueRange { min = (int)RenderQueue.AlphaTest, max = (int)RenderQueue.GeometryLast - 1 };
+                CoreUtils.SetRenderTarget(cmd, m_CameraDepthStencilBufferRT);
+                if (addFullDepthPrepass && !addAlphaTestedOnly) // Always true in case of forward rendering, use in case of deferred rendering if requesting a full depth prepass
+                {
+                    // We render first the opaque object as opaque alpha tested are more costly to render and could be reject by early-z (but not Hi-z as it is disable with clip instruction)
+                    // This is handled automatically with the RenderQueue value (OpaqueAlphaTested have a different value and thus are sorted after Opaque)
+                    RenderOpaqueRenderList(cull, camera, renderContext, cmd, m_DepthOnlyAndDepthForwardOnlyPassNames, 0, RenderQueueRange.opaque);
+                }
+                else // Deferred rendering with partial depth prepass
+                {
+                    // We always do a DepthForwardOnly pass with all the opaque (including alpha test)
+                    RenderOpaqueRenderList(cull, camera, renderContext, cmd, m_DepthForwardOnlyPassNames, 0, RenderQueueRange.opaque);
-                // We render first the opaque object as opaque alpha tested are more costly to render and could be reject by early-z (but not Hi-z as it is disable with clip instruction)
-                // This is handeled automatically with the RenderQueue value (OpaqueAlphaTested have a different value and thus are sorted after Opaque)
-                CoreUtils.SetRenderTarget(cmd, m_CameraDepthStencilBufferRT);
-                // Note: addDepthPrepass and addForwardOnlyOpaqueDepthPrepass can't be both true at the same time. And if we are here both are not false
-                RenderOpaqueRenderList(cull, camera, renderContext, cmd, addDepthPrepass ? HDShaderPassNames.s_DepthOnlyName : HDShaderPassNames.s_ForwardOnlyOpaqueDepthOnlyName, 0, renderQueueRange);
+                    // Render Alpha test only if requested
+                    if (addAlphaTestedOnly)
+                    {
+                        var renderQueueRange = new RenderQueueRange { min = (int)RenderQueue.AlphaTest, max = (int)RenderQueue.GeometryLast - 1 };
+                        RenderOpaqueRenderList(cull, camera, renderContext, cmd, m_DepthOnlyPassNames, 0, renderQueueRange);
+                    }
+                }
             }
         }
 
         // Render forward is use for both transparent and opaque objects. In case of deferred we can still render opaque object in forward.
         void RenderForward(CullResults cullResults, Camera camera, ScriptableRenderContext renderContext, CommandBuffer cmd, bool renderOpaque)
         {
-            // Guidelines: To be able to switch from deferred to forward renderer we need to have forward opaque material with both Forward and ForwardOnlyOpaque pass.
-            // This is what is assume here. But users may want to reduce number of shader combination once they have made their choice.
-
-            // If we are transparent, we add the forward pass. Else (Render Opaque) we add it only if we are forward rendering
-            bool addForwardPass = !renderOpaque || m_Asset.renderingSettings.ShouldUseForwardRenderingOnly();
-
-            // In case of deferred we can still have forward opaque object
-            // It mean that addForwardOnlyOpaquePass = !addForwardPass which is a simplification of: renderOpaque && !m_Asset.renderingSettings.ShouldUseForwardRenderingOnly()
-            // There is no need to store this case as we don't need to test for it
+            // Guidelines: In deferred by default there is no opaque in forward. However it is possible to force an opaque material to render in forward
+            // by using the pass "ForwardOnly". In this case the .shader should not have "Forward" but only a "ForwardOnly" pass.
+            // It must also have a "DepthForwardOnly" and no "DepthOnly" pass as forward material (either deferred or forward only rendering) have always a depth pass.
+            // The RenderForward pass will render the appropriate pass depends on the engine settings. In case of forward only rendering, both "Forward" pass and "ForwardOnly" pass
+            // material will be render for both transparent and opaque. In case of deferred, both path are used for transparent but only "ForwardOnly" is use for opaque.
+            // (Thus why "Forward" and "ForwardOnly" are exclusive, else they will render two times"
-            ShaderPassName passName;
-                passName = addForwardPass ? HDShaderPassNames.s_ForwardDebugDisplayName : HDShaderPassNames.s_ForwardOnlyOpaqueDebugDisplayName;
-                profileName = addForwardPass ? (renderOpaque ? "Forward Opaque Debug Display" : "Forward Transparent Debug Display") : "ForwardOnlyOpaqueDebugDisplay";
+                profileName = renderOpaque ? "Forward Opaque Debug Display" : "Forward Transparent Debug Display";
-                passName = addForwardPass ? HDShaderPassNames.s_ForwardName : HDShaderPassNames.s_ForwardOnlyOpaqueName;
-                profileName = addForwardPass ? (renderOpaque ? "Forward Opaque" : "Forward Transparent") :  "Forward Only Opaque";
+                profileName = renderOpaque ? "Forward Opaque" : "Forward Transparent";
             }
 
             using (new ProfilingSample(cmd, profileName))
                 m_LightLoop.RenderForward(camera, cmd, renderOpaque);
 
-                m_ForwardPassNames[0] = passName;
+                if (m_CurrentDebugDisplaySettings.IsDebugDisplayEnabled())
+                {
+                    m_ForwardAndForwardOnlyPassNames[0] = m_ForwardOnlyPassNames[0] = HDShaderPassNames.s_ForwardOnlyDebugDisplayName;
+                    m_ForwardAndForwardOnlyPassNames[1] = HDShaderPassNames.s_ForwardDebugDisplayName;
+                }
+                else
+                {
+                    m_ForwardAndForwardOnlyPassNames[0] = m_ForwardOnlyPassNames[0] = HDShaderPassNames.s_ForwardOnlyName;
+                    m_ForwardAndForwardOnlyPassNames[1] = HDShaderPassNames.s_ForwardName;
+                }
+
-                    // Forward opaque material always have a prepass (whether or not we use deferred) so we pass the right depth state here.
-                    RenderOpaqueRenderList(cullResults, camera, renderContext, cmd, m_ForwardPassNames, HDUtils.k_RendererConfigurationBakedLighting, null, m_DepthStateOpaqueWithPrepass);
+                    var passNames = m_Asset.renderingSettings.ShouldUseForwardRenderingOnly() ? m_ForwardAndForwardOnlyPassNames : m_ForwardOnlyPassNames;
+                    // Forward opaque material always have a prepass (whether or not we use deferred, whether or not there is option like alpha test only) so we pass the right depth state here.
+                    RenderOpaqueRenderList(cullResults, camera, renderContext, cmd, passNames, HDUtils.k_RendererConfigurationBakedLighting, null, m_DepthStateOpaqueWithPrepass);
-                    RenderTransparentRenderList(cullResults, camera, renderContext, cmd, m_ForwardPassNames, HDUtils.k_RendererConfigurationBakedLighting);
+
+                    RenderTransparentRenderList(cullResults, camera, renderContext, cmd, m_ForwardAndForwardOnlyPassNames, HDUtils.k_RendererConfigurationBakedLighting);
                 }
             }
         }
             {
                 int w = camera.pixelWidth;
                 int h = camera.pixelHeight;
-                int size = Mathf.ClosestPowerOfTwo(Mathf.Min(w, h));
+                int size = CalculatePyramidSize(w, h);
 
                 // The gaussian pyramid compute works in blocks of 8x8 so make sure the last lod has a
                 // minimum size of 8x8
             {
                 int w = camera.pixelWidth;
                 int h = camera.pixelHeight;
-                int size = Mathf.ClosestPowerOfTwo(Mathf.Min(w, h));
+                int size = CalculatePyramidSize(w, h);
 
                 // The gaussian pyramid compute works in blocks of 8x8 so make sure the last lod has a
                 // minimum size of 8x8
             }
         }
 
-        void RenderDistortion(CullResults cullResults, Camera camera, ScriptableRenderContext renderContext, CommandBuffer cmd)
-        {
-            if (!m_CurrentDebugDisplaySettings.renderingDebugSettings.enableDistortion)
-                return;
-
-            using (new ProfilingSample(cmd, "Distortion"))
-            {
-                int w = camera.pixelWidth;
-                int h = camera.pixelHeight;
-
-                cmd.GetTemporaryRT(m_DistortionBuffer, w, h, 0, FilterMode.Point, Builtin.GetDistortionBufferFormat(), Builtin.GetDistortionBufferReadWrite());
-                cmd.SetRenderTarget(m_DistortionBufferRT, m_CameraDepthStencilBufferRT);
-                cmd.ClearRenderTarget(false, true, Color.black); // TODO: can we avoid this clear for performance ?
-
-                // Only transparent object can render distortion vectors
-                RenderTransparentRenderList(cullResults, camera, renderContext, cmd, HDShaderPassNames.s_DistortionVectorsName);
-            }
-        }
-
         void RenderPostProcesses(Camera camera, CommandBuffer cmd, PostProcessLayer layer)
         {
             using (new ProfilingSample(cmd, "Post-processing"))
                     cmd.GetTemporaryRT(m_CameraFilteringBuffer,          w, h, 0, FilterMode.Point, RenderTextureFormat.RGB111110Float, RenderTextureReadWrite.Linear, 1, true); // Enable UAV
 
                     // Color and depth pyramids
-                    int s = Mathf.ClosestPowerOfTwo(Mathf.Min(w, h));
+                    int s = CalculatePyramidSize(w, h);
                     m_GaussianPyramidColorBufferDesc.width = s;
                     m_GaussianPyramidColorBufferDesc.height = s;
                     cmd.GetTemporaryRT(m_GaussianPyramidColorBuffer, m_GaussianPyramidColorBufferDesc, FilterMode.Trilinear);
                 }
                 // END TEMP
             }
+        }
+
+        static int CalculatePyramidSize(int w, int h)
+        {
+            return Mathf.ClosestPowerOfTwo(Mathf.Min(w, h));
         }
     }
 }

ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset

     useForwardRenderingOnly: 0
     useDepthPrepassWithDeferredRendering: 0
     renderAlphaTestOnlyInDeferredPrepass: 0
-  sssSettings:
-    numProfiles: 2
-    profiles:
-    - {fileID: 11400000, guid: 906339bac2066fc4aa22a3652e1283ef, type: 2}
-    - {fileID: 11400000, guid: d6ee4403015766f4093158d69216c0bf, type: 2}
-    texturingModeFlags: 0
-    transmissionFlags: 5462
-    thicknessRemaps:
-    - {x: 0, y: 8.152544, z: 0, w: 0}
-    - {x: 0, y: 0.2873168, z: 0, w: 0}
-    - {x: 0, y: 5, z: 0, w: 0}
-    - {x: 0, y: 12.031147, z: 0, w: 0}
-    - {x: 0, y: 12.031147, z: 0, w: 0}
-    - {x: 0, y: 0, z: 0, w: 0}
-    - {x: 0, y: 0, z: 0, w: 0}
-    - {x: 0, y: 0, z: 0, w: 0}
-    worldScales:
-    - {x: 1, y: 0, z: 0, w: 0}
-    - {x: 1, y: 0, z: 0, w: 0}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    shapeParams:
-    - {x: 1.3192612, y: 3.1152647, z: 4.9751244, w: 7.84603}
-    - {x: 1.3203883, y: 1.4268992, z: 4.0812, w: 7.839332}
-    - {x: 0, y: 0, z: 0, w: 0}
-    - {x: 0, y: 0, z: 0, w: 0}
-    - {x: 0, y: 0, z: 0, w: 0}
-    - {x: 0, y: 0, z: 0, w: 0}
-    - {x: 0, y: 0, z: 0, w: 0}
-    - {x: 0, y: 0, z: 0, w: 0}
-    transmissionTints:
-    - {x: 0.1892157, y: 0.08039216, z: 0.050000004, w: 0.25}
-    - {x: 0.25, y: 0.25, z: 0.25, w: 0.25}
-    - {x: 100, y: 0, z: 100, w: 1}
-    - {x: 100, y: 0, z: 100, w: 1}
-    - {x: 100, y: 0, z: 100, w: 1}
-    - {x: 100, y: 0, z: 100, w: 1}
-    - {x: 100, y: 0, z: 100, w: 1}
-    - {x: 0, y: 0, z: 0, w: 0}
-    filterKernels:
-    - {x: 0.013865918, y: 1.5345725, z: 0.03667902, w: 1.5654991}
-    - {x: 0.04211352, y: 1.5729346, z: 0.11374626, w: 1.6734134}
-    - {x: 0.07107388, y: 1.6130018, z: 0.19626758, w: 1.7949444}
-    - {x: 0.100779116, y: 1.6548817, z: 0.28494877, w: 1.9325867}
-    - {x: 0.13126306, y: 1.6986896, z: 0.38062802, w: 2.0894418}
-    - {x: 0.16256203, y: 1.7445502, z: 0.48430943, w: 2.2694077}
-    - {x: 0.1947145, y: 1.7925992, z: 0.59720695, w: 2.4774427}
-    - {x: 0.22776169, y: 1.8429838, z: 0.72080237, w: 2.7199378}
-    - {x: 0.26174724, y: 1.8958628, z: 0.8569269, w: 3.005264}
-    - {x: 0.29671827, y: 1.9514104, z: 1.007873, w: 3.3445888}
-    - {x: 0.33272493, y: 2.0098157, z: 1.1765549, w: 3.7531407}
-    - {x: 0.369821, y: 2.0712852, z: 1.3667475, w: 4.252257}
-    - {x: 0.40806437, y: 2.1360447, z: 1.5834517, w: 4.872841}
-    - {x: 0.44751683, y: 2.2043417, z: 1.8334827, w: 5.6615734}
-    - {x: 0.48824534, y: 2.276447, z: 2.126473, w: 6.692844}
-    - {x: 0.5303216, y: 2.3526597, z: 2.4767098, w: 8.093767}
-    - {x: 0.5738235, y: 2.433308, z: 2.9068332, w: 10.102725}
-    - {x: 0.61883456, y: 2.5187542, z: 3.4562516, w: 13.228675}
-    - {x: 0.665446, y: 2.609401, z: 4.2041187, w: 18.793621}
-    - {x: 0.713756, y: 2.7056925, z: 5.3538504, w: 31.646347}
-    - {x: 0.763872, y: 2.808125, z: 7.84603, w: 95.44374}
-    - {x: 0.8159103, y: 2.91725, z: 0, w: 1}
-    - {x: 0.8699981, y: 3.0336854, z: 0, w: 1}
-    - {x: 0.9262747, y: 3.1581244, z: 0, w: 1}
-    - {x: 0.98489225, y: 3.2913465, z: 0, w: 1}
-    - {x: 1.0460185, y: 3.434234, z: 0, w: 1}
-    - {x: 1.1098381, y: 3.5877857, z: 0, w: 1}
-    - {x: 1.1765549, y: 3.7531407, z: 0, w: 1}
-    - {x: 1.2463952, y: 3.9316032, z: 0, w: 1}
-    - {x: 1.319611, y: 4.124672, z: 0, w: 1}
-    - {x: 1.3964823, y: 4.3340797, z: 0, w: 1}
-    - {x: 1.4773248, y: 4.561845, z: 0, w: 1}
-    - {x: 1.5624928, y: 4.810328, z: 0, w: 1}
-    - {x: 1.6523882, y: 5.082317, z: 0, w: 1}
-    - {x: 1.747467, y: 5.381122, z: 0, w: 1}
-    - {x: 1.8482518, y: 5.710715, z: 0, w: 1}
-    - {x: 1.9553448, y: 6.0759025, z: 0, w: 1}
-    - {x: 2.069445, y: 6.482568, z: 0, w: 1}
-    - {x: 2.1913698, y: 6.9379897, z: 0, w: 1}
-    - {x: 2.3220856, y: 7.4513016, z: 0, w: 1}
-    - {x: 2.4627466, y: 8.0341215, z: 0, w: 1}
-    - {x: 2.614747, y: 8.701484, z: 0, w: 1}
-    - {x: 2.7797952, y: 9.473195, z: 0, w: 1}
-    - {x: 2.9600194, y: 10.375936, z: 0, w: 1}
-    - {x: 3.1581159, y: 11.446505, z: 0, w: 1}
-    - {x: 3.3775842, y: 12.737201, z: 0, w: 1}
-    - {x: 3.6230793, y: 14.324919, z: 0, w: 1}
-    - {x: 3.9009922, y: 16.327562, z: 0, w: 1}
-    - {x: 4.220452, y: 18.935623, z: 0, w: 1}
-    - {x: 4.5951686, y: 22.478209, z: 0, w: 1}
-    - {x: 5.047148, y: 27.57712, z: 0, w: 1}
-    - {x: 5.615129, y: 35.564823, z: 0, w: 1}
-    - {x: 6.3776174, y: 49.90625, z: 0, w: 1}
-    - {x: 7.5374603, y: 83.30668, z: 0, w: 1}
-    - {x: 10.03481, y: 250.11497, z: 0, w: 1}
-    - {x: 0.013854082, y: 1.5332626, z: 0.036647703, w: 1.5641627}
-    - {x: 0.04207757, y: 1.5715919, z: 0.113649175, w: 1.671985}
-    - {x: 0.07101321, y: 1.611625, z: 0.19610003, w: 1.7934121}
-    - {x: 0.10069309, y: 1.653469, z: 0.28470552, w: 1.9309369}
-    - {x: 0.13115102, y: 1.6972395, z: 0.38030306, w: 2.0876582}
-    - {x: 0.16242325, y: 1.743061, z: 0.48389605, w: 2.2674706}
-    - {x: 0.19454831, y: 1.791069, z: 0.5966971, w: 2.4753277}
-    - {x: 0.22756726, y: 1.8414105, z: 0.72018707, w: 2.717616}
-    - {x: 0.2615238, y: 1.8942443, z: 0.85619545, w: 3.0026984}
-    - {x: 0.29646498, y: 1.9497447, z: 1.0070126, w: 3.3417335}
-    - {x: 0.33244094, y: 2.0081, z: 1.1755506, w: 3.749937}
-    - {x: 0.36950532, y: 2.069517, z: 1.3655809, w: 4.248627}
-    - {x: 0.40771604, y: 2.1342213, z: 1.5821002, w: 4.868682}
-    - {x: 0.44713485, y: 2.2024598, z: 1.8319175, w: 5.6567397}
-    - {x: 0.48782852, y: 2.274504, z: 2.1246579, w: 6.6871305}
-    - {x: 0.5298689, y: 2.3506513, z: 2.4745958, w: 8.086858}
-    - {x: 0.5733336, y: 2.4312308, z: 2.9043517, w: 10.094101}
-    - {x: 0.6183063, y: 2.5166042, z: 3.4533012, w: 13.217383}
-    - {x: 0.66487795, y: 2.6071734, z: 4.20053, w: 18.777578}
-    - {x: 0.71314675, y: 2.703383, z: 5.349281, w: 31.61934}
-    - {x: 0.76321995, y: 2.805728, z: 7.839332, w: 95.36225}
-    - {x: 0.81521386, y: 2.9147599, z: 0, w: 1}
-    - {x: 0.86925554, y: 3.031096, z: 0, w: 1}
-    - {x: 0.92548406, y: 3.1554284, z: 0, w: 1}
-    - {x: 0.9840515, y: 3.288537, z: 0, w: 1}
-    - {x: 1.0451256, y: 3.431302, z: 0, w: 1}
-    - {x: 1.1088905, y: 3.5847225, z: 0, w: 1}
-    - {x: 1.1755506, y: 3.749937, z: 0, w: 1}
-    - {x: 1.2453312, y: 3.9282467, z: 0, w: 1}
-    - {x: 1.3184844, y: 4.1211514, z: 0, w: 1}
-    - {x: 1.3952904, y: 4.3303804, z: 0, w: 1}
-    - {x: 1.4760638, y: 4.5579505, z: 0, w: 1}
-    - {x: 1.5611593, y: 4.8062224, z: 0, w: 1}
-    - {x: 1.650978, y: 5.0779796, z: 0, w: 1}
-    - {x: 1.7459753, y: 5.3765287, z: 0, w: 1}
-    - {x: 1.8466738, y: 5.7058387, z: 0, w: 1}
-    - {x: 1.9536757, y: 6.070716, z: 0, w: 1}
-    - {x: 2.0676782, y: 6.4770336, z: 0, w: 1}
-    - {x: 2.189499, y: 6.9320674, z: 0, w: 1}
-    - {x: 2.3201032, y: 7.4449396, z: 0, w: 1}
-    - {x: 2.4606442, y: 8.027264, z: 0, w: 1}
-    - {x: 2.612515, y: 8.694056, z: 0, w: 1}
-    - {x: 2.777422, y: 9.465107, z: 0, w: 1}
-    - {x: 2.9574924, y: 10.367077, z: 0, w: 1}
-    - {x: 3.1554203, y: 11.436736, z: 0, w: 1}
-    - {x: 3.3747015, y: 12.726331, z: 0, w: 1}
-    - {x: 3.6199868, y: 14.312694, z: 0, w: 1}
-    - {x: 3.897662, y: 16.313623, z: 0, w: 1}
-    - {x: 4.2168484, y: 18.919455, z: 0, w: 1}
-    - {x: 4.5912457, y: 22.459015, z: 0, w: 1}
-    - {x: 5.042839, y: 27.553566, z: 0, w: 1}
-    - {x: 5.610336, y: 35.534466, z: 0, w: 1}
-    - {x: 6.3721733, y: 49.863647, z: 0, w: 1}
-    - {x: 7.53103, y: 83.235695, z: 0, w: 1}
-    - {x: 10.026244, y: 249.90146, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    - {x: 0, y: 1, z: 0, w: 1}
-    useDisneySSS: 1
-    halfRcpWeightedVariances:
-    - {x: 2.4691355, y: 12.5, z: 12.5, w: 2.4691355}
-    - {x: 2.4691355, y: 2.4691355, z: 2.4691355, w: 2.4691355}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    halfRcpVariancesAndWeights:
-    - {x: 0.5, y: 1.125, z: 1.125, w: 2}
-    - {x: 0.125, y: 1.125, z: 1.125, w: 2}
-    - {x: 0.5, y: 0.5, z: 0.5, w: 2}
-    - {x: 0.125, y: 0.125, z: 0.125, w: 2}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 1, y: 1, z: 1, w: 1}
-    - {x: 0, y: 0, z: 0, w: 0}
-    - {x: 0, y: 0, z: 0, w: 0}
-    filterKernelsBasic:
-    - {x: 0.09090909, y: 0.21162307, z: 0.21162307, w: -0.000000048879357}
-    - {x: 0.09090909, y: 0.18990478, z: 0.18990478, w: -0.11381993}
-    - {x: 0.09090909, y: 0.13233659, z: 0.13233659, w: -0.23580086}
-    - {x: 0.09090909, y: 0.061445467, z: 0.061445467, w: -0.37865555}
-    - {x: 0.09090909, y: 0.010501689, z: 0.010501689, w: -0.57677805}
-    - {x: 0.09090909, y: 2.9458339e-10, z: 2.9458339e-10, w: -1.3907351}
-    - {x: 0.09090909, y: 0.18990476, z: 0.18990476, w: 0.11382001}
-    - {x: 0.09090909, y: 0.13233659, z: 0.13233659, w: 0.23580086}
-    - {x: 0.09090909, y: 0.061445467, z: 0.061445467, w: 0.37865555}
-    - {x: 0.09090909, y: 0.010501689, z: 0.010501689, w: 0.57677805}
-    - {x: 0.09090909, y: 2.9456845e-10, z: 2.9456845e-10, w: 1.3907368}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -0.000000048879357}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -0.11381993}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -0.23580086}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -0.37865555}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -0.57677805}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: -1.3907351}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: 0.11382001}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: 0.23580086}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: 0.37865555}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: 0.57677805}
-    - {x: 0.09090909, y: 0.09090909, z: 0.09090909, w: 1.3907368}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
-    - {x: 1, y: 1, z: 1, w: 0}
+  sssSettings: {fileID: 11400000, guid: 873499ce7a6f749408981f512a9683f7, type: 2}
   tileSettings:
     enableTileAndCluster: 1
     enableComputeLightEvaluation: 1

ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.cs

 
         // Renderer Settings
         public RenderingSettings renderingSettings = new RenderingSettings();
-        public SubsurfaceScatteringSettings sssSettings = new SubsurfaceScatteringSettings();
+        public SubsurfaceScatteringSettings sssSettings;
         public TileSettings tileSettings = new TileSettings();
 
         // Shadow Settings
 
         public void OnValidate()
         {
-            sssSettings.OnValidate();
         }
     }
 }

ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs

         public static readonly string s_ForwardStr = "Forward";
         public static readonly string s_ForwardDebugDisplayStr = "ForwardDebugDisplay";
         public static readonly string s_DepthOnlyStr = "DepthOnly";
-        public static readonly string s_ForwardOnlyOpaqueDepthOnlyStr = "ForwardOnlyOpaqueDepthOnly";
-        public static readonly string s_ForwardOnlyOpaqueStr = "ForwardOnlyOpaque";
-        public static readonly string s_ForwardOnlyOpaqueDebugDisplayStr = "ForwardOnlyOpaqueDebugDisplay";
+        public static readonly string s_DepthForwardOnlyStr = "DepthForwardOnly";
+        public static readonly string s_ForwardOnlyStr = "ForwardOnly";
+        public static readonly string s_ForwardOnlyDebugDisplayStr = "ForwardOnlyDebugDisplay";
         public static readonly string s_GBufferStr = "GBuffer";
         public static readonly string s_GBufferWithPrepassStr = "GBufferWithPrepass";
         public static readonly string s_GBufferDebugDisplayStr = "GBufferDebugDisplay";
         public static readonly ShaderPassName s_ForwardName = new ShaderPassName(s_ForwardStr);
         public static readonly ShaderPassName s_ForwardDebugDisplayName = new ShaderPassName(s_ForwardDebugDisplayStr);
         public static readonly ShaderPassName s_DepthOnlyName = new ShaderPassName(s_DepthOnlyStr);
-        public static readonly ShaderPassName s_ForwardOnlyOpaqueDepthOnlyName = new ShaderPassName(s_ForwardOnlyOpaqueDepthOnlyStr);
-        public static readonly ShaderPassName s_ForwardOnlyOpaqueName = new ShaderPassName(s_ForwardOnlyOpaqueStr);
-        public static readonly ShaderPassName s_ForwardOnlyOpaqueDebugDisplayName = new ShaderPassName(s_ForwardOnlyOpaqueDebugDisplayStr);
+        public static readonly ShaderPassName s_DepthForwardOnlyName = new ShaderPassName(s_DepthForwardOnlyStr);
+        public static readonly ShaderPassName s_ForwardOnlyName = new ShaderPassName(s_ForwardOnlyStr);
+        public static readonly ShaderPassName s_ForwardOnlyDebugDisplayName = new ShaderPassName(s_ForwardOnlyDebugDisplayStr);
         public static readonly ShaderPassName s_GBufferName = new ShaderPassName(s_GBufferStr);
         public static readonly ShaderPassName s_GBufferWithPrepassName = new ShaderPassName(s_GBufferWithPrepassStr);
         public static readonly ShaderPassName s_GBufferDebugDisplayName = new ShaderPassName(s_GBufferDebugDisplayStr);
         public static readonly int _InputCubemap = Shader.PropertyToID("_InputCubemap");
         public static readonly int _Mipmap = Shader.PropertyToID("_Mipmap");
 
+        public static readonly int _SubsurfaceProfile = Shader.PropertyToID("_SubsurfaceProfile");
         public static readonly int _MaxRadius = Shader.PropertyToID("_MaxRadius");
         public static readonly int _ShapeParam = Shader.PropertyToID("_ShapeParam");
         public static readonly int _StdDev1 = Shader.PropertyToID("_StdDev1");

ScriptableRenderPipeline/HDRenderPipeline/Lighting/AmbientOcclusion/ScreenSpaceAmbientOcclusion.cs

-using UnityEngine;
 using UnityEngine.Rendering;
 
 namespace UnityEngine.Experimental.Rendering.HDPipeline

ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.cs

             using (var o = new PropertyFetcher<HDAdditionalLightData>(m_SerializedAdditionalLightData))
             m_AdditionalLightData = new SerializedLightData
             {
-                spotInnerPercent = o.FindProperty(x => x.m_InnerSpotPercent),
-                lightDimmer = o.FindProperty(x => x.lightDimmer),
-                fadeDistance = o.FindProperty(x => x.fadeDistance),
-                affectDiffuse = o.FindProperty(x => x.affectDiffuse),
-                affectSpecular = o.FindProperty(x => x.affectSpecular),
-                lightTypeExtent = o.FindProperty(x => x.lightTypeExtent),
-                spotLightShape = o.FindProperty(x => x.spotLightShape),
-                shapeLength = o.FindProperty(x => x.shapeLength),
-                shapeWidth = o.FindProperty(x => x.shapeWidth),
-                shapeRadius = o.FindProperty(x => x.shapeRadius),
-                maxSmoothness = o.FindProperty(x => x.maxSmoothness),
-                applyRangeAttenuation = o.FindProperty(x => x.applyRangeAttenuation),
+                spotInnerPercent = o.Find(x => x.m_InnerSpotPercent),
+                lightDimmer = o.Find(x => x.lightDimmer),
+                fadeDistance = o.Find(x => x.fadeDistance),
+                affectDiffuse = o.Find(x => x.affectDiffuse),
+                affectSpecular = o.Find(x => x.affectSpecular),
+                lightTypeExtent = o.Find(x => x.lightTypeExtent),
+                spotLightShape = o.Find(x => x.spotLightShape),
+                shapeLength = o.Find(x => x.shapeLength),
+                shapeWidth = o.Find(x => x.shapeWidth),
+                shapeRadius = o.Find(x => x.shapeRadius),
+                maxSmoothness = o.Find(x => x.maxSmoothness),
+                applyRangeAttenuation = o.Find(x => x.applyRangeAttenuation),
-                useOldInspector = o.FindProperty(x => x.useOldInspector),
-                showFeatures = o.FindProperty(x => x.featuresFoldout),
-                showAdditionalSettings = o.FindProperty(x => x.showAdditionalSettings)
+                useOldInspector = o.Find(x => x.useOldInspector),
+                showFeatures = o.Find(x => x.featuresFoldout),
+                showAdditionalSettings = o.Find(x => x.showAdditionalSettings)
             };
 
             // TODO: Review this once AdditionalShadowData is refactored
-                dimmer = o.FindProperty(x => x.shadowDimmer),
-                fadeDistance = o.FindProperty(x => x.shadowFadeDistance),
-                cascadeCount = o.FindProperty("shadowCascadeCount"),
-                cascadeRatios = o.FindProperty("shadowCascadeRatios"),
-                cascadeBorders = o.FindProperty("shadowCascadeBorders"),
-                resolution = o.FindProperty(x => x.shadowResolution)
+                dimmer = o.Find(x => x.shadowDimmer),
+                fadeDistance = o.Find(x => x.shadowFadeDistance),
+                cascadeCount = o.Find("shadowCascadeCount"),
+                cascadeRatios = o.Find("shadowCascadeRatios"),
+                cascadeBorders = o.Find("shadowCascadeBorders"),
+                resolution = o.Find(x => x.shadowResolution)
             };
         }
 

ScriptableRenderPipeline/HDRenderPipeline/Material/Builtin/BuiltinData.hlsl

     velocity = inBuffer.xy;
 }
 
-void EncodeDistortion(float2 distortion, float distortionBlur, out float4 outBuffer)
+void EncodeDistortion(float2 distortion, float distortionBlur, bool isValidSource, out float4 outBuffer)
-    outBuffer = float4(distortion, 0.0, distortionBlur);
+    outBuffer = float4(distortion, isValidSource, distortionBlur);
-void DecodeDistortion(float4 inBuffer, out float2 distortion, out float2 distortionBlur)
+void DecodeDistortion(float4 inBuffer, out float2 distortion, out float distortionBlur, out bool isValidSource)
+    isValidSource = (inBuffer.z != 0.0);
 }
 
 void GetBuiltinDataDebug(uint paramId, BuiltinData builtinData, inout float3 result, inout bool needLinearToSRGB)

ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/Editor/LayeredLitUI.cs

             public readonly GUIContent heightOffset = new GUIContent("Height Offset", "Offset applied to the height before layering.");
             public readonly GUIContent heightTransition = new GUIContent("Height Transition", "Size in world units of the smooth transition between layers.");
 
+            public readonly GUIContent perPixelDisplacementLayersWarning = new GUIContent("For pixel displacement to work correctly, all layers with a heightmap must use the same UV mapping");
+
             public readonly GUIContent materialReferencesText = new GUIContent("Material References");
 
             public StylesLayer()
             bool mainLayerInfluenceEnable = useMainLayerInfluence.floatValue > 0.0f;
             bool heightBasedBlend = useHeightBasedBlend.floatValue > 0.0f;
 
+            EditorGUILayout.LabelField(styles.layeringOptionText, EditorStyles.boldLabel);
+            EditorGUI.indentLevel++;
+
-            if(layerIndex > 0 || heightBasedBlend )
+            if (layerIndex > 0)
-                EditorGUILayout.LabelField(styles.layeringOptionText, EditorStyles.boldLabel);
-                EditorGUI.indentLevel++;
-
-                // influence
-                if (layerIndex > 0)
-                {
-                    int paramIndex = layerIndex - 1;
+                int paramIndex = layerIndex - 1;
-                    m_MaterialEditor.ShaderProperty(opacityAsDensity[layerIndex], styles.opacityAsDensityText);
+                m_MaterialEditor.ShaderProperty(opacityAsDensity[layerIndex], styles.opacityAsDensityText);
-                    if (mainLayerInfluenceEnable)
-                    {
-                        m_MaterialEditor.ShaderProperty(inheritBaseColor[paramIndex], styles.inheritBaseColorText);
-                        m_MaterialEditor.ShaderProperty(inheritBaseNormal[paramIndex], styles.inheritBaseNormalText);
-                        // Main height influence is only available if the shader use the heightmap for displacement (per vertex or per level)
-                        // We always display it as it can be tricky to know when per pixel displacement is enabled or not
-                        m_MaterialEditor.ShaderProperty(inheritBaseHeight[paramIndex], styles.inheritBaseHeightText);
-                    }
+                if (mainLayerInfluenceEnable)
+                {
+                    m_MaterialEditor.ShaderProperty(inheritBaseColor[paramIndex], styles.inheritBaseColorText);
+                    m_MaterialEditor.ShaderProperty(inheritBaseNormal[paramIndex], styles.inheritBaseNormalText);
+                    // Main height influence is only available if the shader use the heightmap for displacement (per vertex or per level)
+                    // We always display it as it can be tricky to know when per pixel displacement is enabled or not
+                    m_MaterialEditor.ShaderProperty(inheritBaseHeight[paramIndex], styles.inheritBaseHeightText);
-
-                if (heightBasedBlend)
+            }
+            else
+            {
+                if (!useMainLayerInfluence.hasMixedValue && useMainLayerInfluence.floatValue != 0.0f)
-                    m_MaterialEditor.ShaderProperty(heightOffset[layerIndex], styles.heightOffset);
+                    m_MaterialEditor.TexturePropertySingleLine(styles.layerInfluenceMapMaskText, layerInfluenceMaskMap);
+            }
-                EditorGUI.indentLevel--;
-                EditorGUILayout.Space();
+            if (heightBasedBlend)
+            {
+                m_MaterialEditor.ShaderProperty(heightOffset[layerIndex], styles.heightOffset);
+
+            EditorGUI.indentLevel--;
+            EditorGUILayout.Space();
 
             DoLayerGUI(material, layerIndex);
 
             {
                 useMainLayerInfluence.floatValue = mainLayerModeInfluenceEnable ? 1.0f : 0.0f;
             }
-            if (!useMainLayerInfluence.hasMixedValue && useMainLayerInfluence.floatValue != 0.0f)
-            {
-                EditorGUI.indentLevel++;
-                m_MaterialEditor.TexturePropertySingleLine(styles.layerInfluenceMapMaskText, layerInfluenceMaskMap);
-                EditorGUI.indentLevel--;
-            }
 
             EditorGUI.BeginChangeCheck();
             EditorGUI.showMixedValue = useHeightBasedBlend.hasMixedValue;
                 SetKeyword(material, "_HEIGHTMAP" + i, material.GetTexture(kHeightMap + i));
             }
 
+            SetKeyword(material, "_INFLUENCEMASK_MAP", material.GetTexture(kLayerInfluenceMaskMap) && material.GetFloat(kkUseMainLayerInfluence) != 0.0f);
+
             SetKeyword(material, "_EMISSIVE_COLOR_MAP", material.GetTexture(kEmissiveColorMap));
             SetKeyword(material, "_ENABLESPECULAROCCLUSION", material.GetFloat(kEnableSpecularOcclusion) > 0.0f);
 
             {
                 optionsChanged = true;
             }
+
+            // In case of pixel displacement and layered shader, all layers must used the same texture mapping for layer that have a heightmap
+            // (Else the algorithm will not work correctly)
+            if ((DisplacementMode)displacementMode.floatValue == DisplacementMode.Pixel)
+            {
+                float compareValue = -1.0f;
+                bool match = true;
+
+                if (material.GetTexture(kHeightMap + 0))
+                {
+                    compareValue = UVBase[0].floatValue;
+                }
+                if (material.GetTexture(kHeightMap + 1))
+                {
+                    if (compareValue == -1.0f)
+                        compareValue = UVBase[1].floatValue;
+                    else if (compareValue != UVBase[1].floatValue)
+                        match = false;
+                }
+                if (material.GetTexture(kHeightMap + 2))
+                {
+                    if (compareValue == -1.0f)
+                        compareValue = UVBase[2].floatValue;
+                    else if (compareValue != UVBase[2].floatValue)
+                        match = false;
+                }
+                if (material.GetTexture(kHeightMap + 3))
+                {
+                    if (compareValue == -1.0f)
+                        compareValue = UVBase[3].floatValue;
+                    else if (compareValue != UVBase[3].floatValue)
+                        match = false;
+                }
+
+                if (!match)
+                {
+                    EditorGUILayout.HelpBox(styles.perPixelDisplacementLayersWarning.text, MessageType.Warning);
+                }
+            }
+
 
             bool layerChanged = DoLayersGUI(materialImporter);
             DoEmissiveGUI(material);

ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader

         _DetailMap2("DetailMap2", 2D) = "black" {}
         _DetailMap3("DetailMap3", 2D) = "black" {}
 
-        _DetailAlbedoScale0("_DetailAlbedoScale0", Range(-2.0, 2.0)) = 1
-        _DetailAlbedoScale1("_DetailAlbedoScale1", Range(-2.0, 2.0)) = 1
-        _DetailAlbedoScale2("_DetailAlbedoScale2", Range(-2.0, 2.0)) = 1
-        _DetailAlbedoScale3("_DetailAlbedoScale3", Range(-2.0, 2.0)) = 1
+        _DetailAlbedoScale0("_DetailAlbedoScale0", Range(0.0, 2.0)) = 1
+        _DetailAlbedoScale1("_DetailAlbedoScale1", Range(0.0, 2.0)) = 1
+        _DetailAlbedoScale2("_DetailAlbedoScale2", Range(0.0, 2.0)) = 1
+        _DetailAlbedoScale3("_DetailAlbedoScale3", Range(0.0, 2.0)) = 1
 
         _DetailNormalScale0("_DetailNormalScale0", Range(0.0, 2.0)) = 1
         _DetailNormalScale1("_DetailNormalScale1", Range(0.0, 2.0)) = 1
-        _DetailSmoothnessScale0("_DetailSmoothnessScale0", Range(-2.0, 2.0)) = 1
-        _DetailSmoothnessScale1("_DetailSmoothnessScale1", Range(-2.0, 2.0)) = 1
-        _DetailSmoothnessScale2("_DetailSmoothnessScale2", Range(-2.0, 2.0)) = 1
-        _DetailSmoothnessScale3("_DetailSmoothnessScale3", Range(-2.0, 2.0)) = 1
+        _DetailSmoothnessScale0("_DetailSmoothnessScale0", Range(0.0, 2.0)) = 1
+        _DetailSmoothnessScale1("_DetailSmoothnessScale1", Range(0.0, 2.0)) = 1
+        _DetailSmoothnessScale2("_DetailSmoothnessScale2", Range(0.0, 2.0)) = 1
+        _DetailSmoothnessScale3("_DetailSmoothnessScale3", Range(0.0, 2.0)) = 1
 
         [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace0("NormalMap space", Float) = 0
         [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace1("NormalMap space", Float) = 0
         [Enum(None, 0, Mirror, 1, Flip, 2)] _DoubleSidedNormalMode("Double sided normal mode", Float) = 1
         [HideInInspector] _DoubleSidedConstants("_DoubleSidedConstants", Vector) = (1, 1, -1, 0)
 
-        [ToggleOff]  _EnablePerPixelDisplacement("Enable per pixel displacement", Float) = 0.0
+        [Enum(None, 0, Vertex displacement, 1, Pixel displacement, 2)] _DisplacementMode("DisplacementMode", Int) = 0
+        [ToggleOff] _DisplacementLockObjectScale("displacement lock object scale", Float) = 1.0
+        [ToggleOff] _DisplacementLockTilingScale("displacement lock tiling scale", Float) = 1.0
+
-        [ToggleOff] _PerPixelDisplacementObjectScale("Per pixel displacement object scale", Float) = 1.0
+        _PPDPrimitiveLength("Primitive length for POM", Float) = 1
+        _PPDPrimitiveWidth("Primitive width for POM", Float) = 1
+        [HideInInspector] _InvPrimScale("Inverse primitive scale for non-planar POM", Vector) = (1, 1, 0, 0)
-        // Displacement map
-        [ToggleOff] _EnableVertexDisplacement("Enable vertex displacement", Float) = 0.0
-        [ToggleOff] _VertexDisplacementObjectScale("Vertex displacement object scale", Float) = 1.0
-        [ToggleOff] _VertexDisplacementTilingScale("Vertex displacement tiling height scale", Float) = 1.0
-
         // Wind
         [ToggleOff]  _EnableWind("Enable Wind", Float) = 0.0
         _InitialBend("Initial Bend", float) = 1.0
         _TexWorldScale2("Tiling", Float) = 1.0
         _TexWorldScale3("Tiling", Float) = 1.0
 
+        [HideInInspector] _InvTilingScale0("Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y))", Float) = 1
+        [HideInInspector] _InvTilingScale1("Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y))", Float) = 1
+        [HideInInspector] _InvTilingScale2("Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y))", Float) = 1
+        [HideInInspector] _InvTilingScale3("Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y))", Float) = 1
+
         [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3, Planar, 4, Triplanar, 5)] _UVBase0("UV Set for base0", Float) = 0 // no UV1/2/3 for main layer (matching Lit.shader and for PPDisplacement restriction)
         [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3, Planar, 4, Triplanar, 5)] _UVBase1("UV Set for base1", Float) = 0
         [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3, Planar, 4, Triplanar, 5)] _UVBase2("UV Set for base2", Float) = 0
         [HideInInspector] _UVDetailsMappingMask2("_UVDetailsMappingMask2", Color) = (1, 0, 0, 0)
         [HideInInspector] _UVDetailsMappingMask3("_UVDetailsMappingMask3", Color) = (1, 0, 0, 0)
 
+        [ToggleOff] _LinkDetailsWithBase0("LinkDetailsWithBase0", Float) = 1.0
+        [ToggleOff] _LinkDetailsWithBase1("LinkDetailsWithBase1", Float) = 1.0
+        [ToggleOff] _LinkDetailsWithBase2("LinkDetailsWithBase2", Float) = 1.0
+        [ToggleOff] _LinkDetailsWithBase3("LinkDetailsWithBase3", Float) = 1.0
+
         [HideInInspector] _ShowMaterialReferences("_ShowMaterialReferences", Float) = 0
         [HideInInspector] _ShowLayer0("_ShowLayer0", Float) = 0
         [HideInInspector] _ShowLayer1("_ShowLayer1", Float) = 0
     #pragma shader_feature _ALPHATEST_ON
     #pragma shader_feature _DEPTHOFFSET_ON
     #pragma shader_feature _DOUBLESIDED_ON
-    #pragma shader_feature _PER_PIXEL_DISPLACEMENT
-    #pragma shader_feature _PER_PIXEL_DISPLACEMENT_OBJECT_SCALE
-    #pragma shader_feature _VERTEX_DISPLACEMENT
-    #pragma shader_feature _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    #pragma shader_feature _VERTEX_DISPLACEMENT_TILING_SCALE
+    #pragma shader_feature _ _VERTEX_DISPLACEMENT _PIXEL_DISPLACEMENT
+    #pragma shader_feature _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE
+    #pragma shader_feature _DISPLACEMENT_LOCK_TILING_SCALE
+    #pragma shader_feature _PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE
     #pragma shader_feature _VERTEX_WIND
 
     #pragma shader_feature _LAYER_TILING_COUPLED_WITH_UNIFORM_OBJECT_SCALE
     #pragma shader_feature _DETAIL_MAP3
     #pragma shader_feature _ _LAYER_MASK_VERTEX_COLOR_MUL _LAYER_MASK_VERTEX_COLOR_ADD
     #pragma shader_feature _MAIN_LAYER_INFLUENCE_MODE
+    #pragma shader_feature _INFLUENCEMASK_MAP
     #pragma shader_feature _DENSITY_MODE
     #pragma shader_feature _HEIGHT_BASED_BLEND
     #pragma shader_feature _ _LAYEREDLIT_3_LAYERS _LAYEREDLIT_4_LAYERS

ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader

         _DetailMap2("DetailMap2", 2D) = "black" {}
         _DetailMap3("DetailMap3", 2D) = "black" {}
 
-        _DetailAlbedoScale0("_DetailAlbedoScale0", Range(-2.0, 2.0)) = 1
-        _DetailAlbedoScale1("_DetailAlbedoScale1", Range(-2.0, 2.0)) = 1
-        _DetailAlbedoScale2("_DetailAlbedoScale2", Range(-2.0, 2.0)) = 1
-        _DetailAlbedoScale3("_DetailAlbedoScale3", Range(-2.0, 2.0)) = 1
+        _DetailAlbedoScale0("_DetailAlbedoScale0", Range(0.0, 2.0)) = 1
+        _DetailAlbedoScale1("_DetailAlbedoScale1", Range(0.0, 2.0)) = 1
+        _DetailAlbedoScale2("_DetailAlbedoScale2", Range(0.0, 2.0)) = 1
+        _DetailAlbedoScale3("_DetailAlbedoScale3", Range(0.0, 2.0)) = 1
 
         _DetailNormalScale0("_DetailNormalScale0", Range(0.0, 2.0)) = 1
         _DetailNormalScale1("_DetailNormalScale1", Range(0.0, 2.0)) = 1
-        _DetailSmoothnessScale0("_DetailSmoothnessScale0", Range(-2.0, 2.0)) = 1
-        _DetailSmoothnessScale1("_DetailSmoothnessScale1", Range(-2.0, 2.0)) = 1
-        _DetailSmoothnessScale2("_DetailSmoothnessScale2", Range(-2.0, 2.0)) = 1
-        _DetailSmoothnessScale3("_DetailSmoothnessScale3", Range(-2.0, 2.0)) = 1
+        _DetailSmoothnessScale0("_DetailSmoothnessScale0", Range(0.0, 2.0)) = 1
+        _DetailSmoothnessScale1("_DetailSmoothnessScale1", Range(0.0, 2.0)) = 1
+        _DetailSmoothnessScale2("_DetailSmoothnessScale2", Range(0.0, 2.0)) = 1
+        _DetailSmoothnessScale3("_DetailSmoothnessScale3", Range(0.0, 2.0)) = 1
 
         [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace0("NormalMap space", Float) = 0
         [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace1("NormalMap space", Float) = 0
         [Enum(None, 0, Mirror, 1, Flip, 2)] _DoubleSidedNormalMode("Double sided normal mode", Float) = 1
         [HideInInspector] _DoubleSidedConstants("_DoubleSidedConstants", Vector) = (1, 1, -1, 0)
 
-        [ToggleOff]  _EnablePerPixelDisplacement("Enable per pixel displacement", Float) = 0.0
+        [Enum(None, 0, Vertex displacement, 1, Pixel displacement, 2, Tessellation displacement, 3)] _DisplacementMode("DisplacementMode", Int) = 0
+        [ToggleOff] _DisplacementLockObjectScale("displacement lock object scale", Float) = 1.0
+        [ToggleOff] _DisplacementLockTilingScale("displacement lock tiling scale", Float) = 1.0
+
-        [ToggleOff] _PerPixelDisplacementObjectScale("Per pixel displacement object scale", Float) = 1.0
+        _PPDPrimitiveLength("Primitive length for POM", Float) = 1
+        _PPDPrimitiveWidth("Primitive width for POM", Float) = 1
+        [HideInInspector] _InvPrimScale("Inverse primitive scale for non-planar POM", Vector) = (1, 1, 0, 0)
-        // Displacement map
-        [ToggleOff] _EnableVertexDisplacement("Enable vertex displacement", Float) = 0.0
-        [ToggleOff] _VertexDisplacementObjectScale("Vertex displacement object scale", Float) = 1.0
-        [ToggleOff] _VertexDisplacementTilingScale("Vertex displacement tiling height scale", Float) = 1.0
-
         // Wind
         [ToggleOff]  _EnableWind("Enable Wind", Float) = 0.0
         _InitialBend("Initial Bend", float) = 1.0
         _TexWorldScale2("Tiling", Float) = 1.0
         _TexWorldScale3("Tiling", Float) = 1.0
 
+        [HideInInspector] _InvTilingScale0("Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y))", Float) = 1
+        [HideInInspector] _InvTilingScale1("Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y))", Float) = 1
+        [HideInInspector] _InvTilingScale2("Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y))", Float) = 1
+        [HideInInspector] _InvTilingScale3("Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y))", Float) = 1
+
         [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3, Planar, 4, Triplanar, 5)] _UVBase0("UV Set for base0", Float) = 0 // no UV1/2/3 for main layer (matching Lit.shader and for PPDisplacement restriction)
         [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3, Planar, 4, Triplanar, 5)] _UVBase1("UV Set for base1", Float) = 0
         [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3, Planar, 4, Triplanar, 5)] _UVBase2("UV Set for base2", Float) = 0
         [HideInInspector] _UVDetailsMappingMask2("_UVDetailsMappingMask2", Color) = (1, 0, 0, 0)
         [HideInInspector] _UVDetailsMappingMask3("_UVDetailsMappingMask3", Color) = (1, 0, 0, 0)
 
+        [ToggleOff] _LinkDetailsWithBase0("LinkDetailsWithBase0", Float) = 1.0
+        [ToggleOff] _LinkDetailsWithBase1("LinkDetailsWithBase1", Float) = 1.0
+        [ToggleOff] _LinkDetailsWithBase2("LinkDetailsWithBase2", Float) = 1.0
+        [ToggleOff] _LinkDetailsWithBase3("LinkDetailsWithBase3", Float) = 1.0
+
         [HideInInspector] _ShowMaterialReferences("_ShowMaterialReferences", Float) = 0
         [HideInInspector] _ShowLayer0("_ShowLayer0", Float) = 0
         [HideInInspector] _ShowLayer1("_ShowLayer1", Float) = 0
     #pragma shader_feature _ALPHATEST_ON
     #pragma shader_feature _DEPTHOFFSET_ON
     #pragma shader_feature _DOUBLESIDED_ON
-    #pragma shader_feature _PER_PIXEL_DISPLACEMENT
-    #pragma shader_feature _PER_PIXEL_DISPLACEMENT_OBJECT_SCALE
-    #pragma shader_feature _VERTEX_DISPLACEMENT
-    #pragma shader_feature _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    #pragma shader_feature _VERTEX_DISPLACEMENT_TILING_SCALE
+    #pragma shader_feature _ _VERTEX_DISPLACEMENT _PIXEL_DISPLACEMENT _TESSELLATION_DISPLACEMENT
+    #pragma shader_feature _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE
+    #pragma shader_feature _DISPLACEMENT_LOCK_TILING_SCALE
+    #pragma shader_feature _PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE
     #pragma shader_feature _VERTEX_WIND
     #pragma shader_feature _TESSELLATION_PHONG
 
     #pragma shader_feature _DETAIL_MAP3
     #pragma shader_feature _ _LAYER_MASK_VERTEX_COLOR_MUL _LAYER_MASK_VERTEX_COLOR_ADD
     #pragma shader_feature _MAIN_LAYER_INFLUENCE_MODE
+    #pragma shader_feature _INFLUENCEMASK_MAP
     #pragma shader_feature _DENSITY_MODE
     #pragma shader_feature _HEIGHT_BASED_BLEND
     #pragma shader_feature _ _LAYEREDLIT_3_LAYERS _LAYEREDLIT_4_LAYERS

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/BaseLitUI.cs

             public static GUIContent doubleSidedNormalModeText = new GUIContent("Normal mode", "This will modify the normal base on the selected mode. None: untouch, Mirror: Mirror the normal with vertex normal plane, Flip: Flip the normal");
             public static GUIContent depthOffsetEnableText = new GUIContent("Enable Depth Offset", "EnableDepthOffset on this shader (Use with heightmap)");
 
+            // Displacement mapping (POM, tessellation, per vertex)
+            //public static GUIContent enablePerPixelDisplacementText = new GUIContent("Enable Per Pixel Displacement", "");
+
+            public static GUIContent displacementModeText = new GUIContent("Displacement mode", "Apply heightmap displacement to the selected element: Vertex, pixel or tessellated vertex. Pixel displacement must be use with flat surfaces, it is an expensive features and typical usage is paved road.");
+            public static GUIContent lockWithObjectScaleText = new GUIContent("Lock with object scale", "Displacement mapping will take the absolute value of the scale of the object into account.");
+            public static GUIContent lockWithTilingRateText = new GUIContent("Lock with height map tiling rate", "Displacement mapping will take the absolute value of the tiling rate of the height map into account.");
+
-            // Per pixel displacement
-            public static GUIContent enablePerPixelDisplacementText = new GUIContent("Enable Per Pixel Displacement", "Per pixel displacement work best with flat surfaces. This is an expensive features and should be enable wisely. Typical use case is paved road.");
+            // Per pixel displacement            
-            public static GUIContent perPixelDisplacementObjectScaleText = new GUIContent("Lock with object scale", "Per Pixel displacement will take into account the tiling scale - Only work with uniform positive scale");
-
-            // Vertex displacement
-            public static string vertexDisplacementText = "Vertex displacement";
-
-            public static GUIContent enableVertexDisplacementText = new GUIContent("Enable vertex displacement", "Use heightmap as a displacement map. Displacement map is use to move vertex position in local space");
-            public static GUIContent vertexDisplacementObjectScaleText = new GUIContent("Lock with object scale", "Vertex displacement will take into account the object scale - Only work with uniform positive scale");
-            public static GUIContent vertexDisplacementTilingScaleText = new GUIContent("Lock with heightmap tiling", "Vertex displacement will take into account the tiling scale - Only work with uniform positive scale");
+            public static GUIContent ppdPrimitiveLength = new GUIContent("Primitive length", "Dimensions of the primitive (with the scale of 1) to which the per-pixel displacement mapping is being applied. For example, the standard quad is 1 x 1 meter, while the standard plane is 10 x 10 meters.");
+            public static GUIContent ppdPrimitiveWidth = new GUIContent("Primitive width", "Dimensions of the primitive (with the scale of 1) to which the per-pixel displacement mapping is being applied. For example, the standard quad is 1 x 1 meter, while the standard plane is 10 x 10 meters.");
-            public static string tessellationModeText = "Tessellation Mode";
+            public static string tessellationModeStr = "Tessellation Mode";
             public static readonly string[] tessellationModeNames = Enum.GetNames(typeof(TessellationMode));
 
             public static GUIContent tessellationText = new GUIContent("Tessellation options", "Tessellation options");
             Phong
         }
 
+        public enum DisplacementMode
+        {
+            None,
+            Vertex,
+            Pixel,
+            Tessellation
+        }
+
         protected MaterialProperty doubleSidedNormalMode = null;
         protected const string kDoubleSidedNormalMode = "_DoubleSidedNormalMode";
         protected MaterialProperty depthOffsetEnable = null;
 
         protected const string     kStencilRef = "_StencilRef";
 
+        protected MaterialProperty displacementMode = null;
+        protected const string kDisplacementMode = "_DisplacementMode";
+        protected MaterialProperty displacementLockObjectScale = null;
+        protected const string kDisplacementLockObjectScale = "_DisplacementLockObjectScale";
+        protected MaterialProperty displacementLockTilingScale = null;
+        protected const string kDisplacementLockTilingScale = "_DisplacementLockTilingScale";
+
-        protected MaterialProperty enablePerPixelDisplacement = null;
-        protected const string kEnablePerPixelDisplacement = "_EnablePerPixelDisplacement";
         protected MaterialProperty ppdMinSamples = null;
         protected const string kPpdMinSamples = "_PPDMinSamples";
         protected MaterialProperty ppdMaxSamples = null;
-        protected MaterialProperty perPixelDisplacementObjectScale = null;
-        protected const string kPerPixelDisplacementObjectScale = "_PerPixelDisplacementObjectScale";
-
-        // Vertex displacement
-        protected MaterialProperty enableVertexDisplacement = null;
-        protected const string kEnableVertexDisplacement = "_EnableVertexDisplacement";
-        protected MaterialProperty vertexDisplacementObjectScale = null;
-        protected const string kVertexDisplacementObjectScale = "_VertexDisplacementObjectScale";
-        protected MaterialProperty vertexDisplacementTilingScale = null;
-        protected const string kVertexDisplacementTilingScale = "_VertexDisplacementTilingScale";
+        protected MaterialProperty ppdPrimitiveLength = null;
+        protected const string kPpdPrimitiveLength = "_PPDPrimitiveLength";
+        protected MaterialProperty ppdPrimitiveWidth = null;
+        protected const string kPpdPrimitiveWidth = "_PPDPrimitiveWidth";
+        protected MaterialProperty invPrimScale = null;
+        protected const string kInvPrimScale = "_InvPrimScale";
 
         // Wind
         protected MaterialProperty windEnable = null;
             // MaterialID
             materialID = FindProperty(kMaterialID, props, false); // LayeredLit is force to be standard for now, so materialID could not exist
 
+            displacementMode = FindProperty(kDisplacementMode, props);
+            displacementLockObjectScale = FindProperty(kDisplacementLockObjectScale, props);
+            displacementLockTilingScale = FindProperty(kDisplacementLockTilingScale, props);
+
-            enablePerPixelDisplacement = FindProperty(kEnablePerPixelDisplacement, props);
-            perPixelDisplacementObjectScale = FindProperty(kPerPixelDisplacementObjectScale, props);
-
-            // vertex displacement
-            enableVertexDisplacement = FindProperty(kEnableVertexDisplacement, props);
-            vertexDisplacementObjectScale = FindProperty(kVertexDisplacementObjectScale, props);
-            vertexDisplacementTilingScale = FindProperty(kVertexDisplacementTilingScale, props);
+            ppdPrimitiveLength = FindProperty(kPpdPrimitiveLength, props);
+            ppdPrimitiveWidth  = FindProperty(kPpdPrimitiveWidth, props);
+            invPrimScale = FindProperty(kInvPrimScale, props);            
 
             // tessellation specific, silent if not found
             tessellationMode = FindProperty(kTessellationMode, props, false);
             var mode = (TessellationMode)tessellationMode.floatValue;
 
             EditorGUI.BeginChangeCheck();
-            mode = (TessellationMode)EditorGUILayout.Popup(StylesBaseLit.tessellationModeText, (int)mode, StylesBaseLit.tessellationModeNames);
+            mode = (TessellationMode)EditorGUILayout.Popup(StylesBaseLit.tessellationModeStr, (int)mode, StylesBaseLit.tessellationModeNames);
             if (EditorGUI.EndChangeCheck())
             {
                 m_MaterialEditor.RegisterPropertyChangeUndo("Tessellation Mode");
             if (materialID != null)
                 m_MaterialEditor.ShaderProperty(materialID, StylesBaseLit.materialIDText);
 
-            m_MaterialEditor.ShaderProperty(enablePerPixelDisplacement, StylesBaseLit.enablePerPixelDisplacementText);
-            if (enablePerPixelDisplacement.floatValue > 0.0f)
+            m_MaterialEditor.ShaderProperty(displacementMode, StylesBaseLit.displacementModeText);
+            if ((DisplacementMode)displacementMode.floatValue != DisplacementMode.None)
-                m_MaterialEditor.ShaderProperty(ppdMinSamples, StylesBaseLit.ppdMinSamplesText);
-                m_MaterialEditor.ShaderProperty(ppdMaxSamples, StylesBaseLit.ppdMaxSamplesText);
-                ppdMinSamples.floatValue = Mathf.Min(ppdMinSamples.floatValue, ppdMaxSamples.floatValue);
-                m_MaterialEditor.ShaderProperty(ppdLodThreshold, StylesBaseLit.ppdLodThresholdText);
-                //m_MaterialEditor.ShaderProperty(perPixelDisplacementObjectScale, StylesBaseLit.perPixelDisplacementObjectScaleText);
-                m_MaterialEditor.ShaderProperty(depthOffsetEnable, StylesBaseLit.depthOffsetEnableText);
+                m_MaterialEditor.ShaderProperty(displacementLockObjectScale, StylesBaseLit.lockWithObjectScaleText);
+                m_MaterialEditor.ShaderProperty(displacementLockTilingScale, StylesBaseLit.lockWithTilingRateText);
-            EditorGUI.indentLevel--;
-
-            // Vertex displacement options
-            EditorGUILayout.Space();
-            EditorGUILayout.LabelField(StylesBaseLit.vertexDisplacementText, EditorStyles.boldLabel);
-            EditorGUI.indentLevel++;
-
-            m_MaterialEditor.ShaderProperty(enableVertexDisplacement, StylesBaseLit.enableVertexDisplacementText);
-            if (enableVertexDisplacement.floatValue > 0.0f)
+            if ((DisplacementMode)displacementMode.floatValue == DisplacementMode.Pixel)
+                EditorGUILayout.Space();
-                m_MaterialEditor.ShaderProperty(vertexDisplacementObjectScale, StylesBaseLit.vertexDisplacementObjectScaleText);
-                m_MaterialEditor.ShaderProperty(vertexDisplacementTilingScale, StylesBaseLit.vertexDisplacementTilingScaleText);
+                m_MaterialEditor.ShaderProperty(ppdMinSamples, StylesBaseLit.ppdMinSamplesText);
+                m_MaterialEditor.ShaderProperty(ppdMaxSamples, StylesBaseLit.ppdMaxSamplesText);
+                ppdMinSamples.floatValue = Mathf.Min(ppdMinSamples.floatValue, ppdMaxSamples.floatValue);
+                m_MaterialEditor.ShaderProperty(ppdLodThreshold, StylesBaseLit.ppdLodThresholdText);
+                m_MaterialEditor.ShaderProperty(ppdPrimitiveLength, StylesBaseLit.ppdPrimitiveLength);
+                ppdPrimitiveLength.floatValue = Mathf.Max(0.01f, ppdPrimitiveLength.floatValue);
+                m_MaterialEditor.ShaderProperty(ppdPrimitiveWidth, StylesBaseLit.ppdPrimitiveWidth);
+                ppdPrimitiveWidth.floatValue = Mathf.Max(0.01f, ppdPrimitiveWidth.floatValue);
+                invPrimScale.vectorValue = new Vector4(1.0f / ppdPrimitiveLength.floatValue, 1.0f / ppdPrimitiveWidth.floatValue); // Precompute
+                m_MaterialEditor.ShaderProperty(depthOffsetEnable, StylesBaseLit.depthOffsetEnableText);
                 EditorGUI.indentLevel--;
             }
 
                 }
             }
 
-            // Depth offset is only enabled if per pixel displacement is
-            bool depthOffsetEnable = (material.GetFloat(kDepthOffsetEnable) > 0.0f) && (material.GetFloat(kEnablePerPixelDisplacement) > 0.0f);
-            SetKeyword(material, "_DEPTHOFFSET_ON", depthOffsetEnable);
-
             // Set the reference value for the stencil test.
             int stencilRef = (int)StencilLightingUsage.RegularLighting;
             if (material.HasProperty(kMaterialID))
             }
             material.SetInt(kStencilRef, stencilRef);
 
-            bool enablePerPixelDisplacement = material.GetFloat(kEnablePerPixelDisplacement) > 0.0f;
-            SetKeyword(material, "_PER_PIXEL_DISPLACEMENT", enablePerPixelDisplacement);
-
-            bool perPixelDisplacementObjectScale = material.GetFloat(kPerPixelDisplacementObjectScale) > 0.0;
-            SetKeyword(material, "_PER_PIXEL_DISPLACEMENT_OBJECT_SCALE", perPixelDisplacementObjectScale && enablePerPixelDisplacement);
+            bool enableDisplacement = (DisplacementMode)material.GetFloat(kDisplacementMode) != DisplacementMode.None;
+            bool enableVertexDisplacement = (DisplacementMode)material.GetFloat(kDisplacementMode) == DisplacementMode.Vertex;
+            bool enablePixelDisplacement = (DisplacementMode)material.GetFloat(kDisplacementMode) == DisplacementMode.Pixel;
+            bool enableTessellationDisplacement = ((DisplacementMode)material.GetFloat(kDisplacementMode) == DisplacementMode.Tessellation) && material.HasProperty(kTessellationMode);
-            bool enableVertexDisplacement = material.GetFloat(kEnableVertexDisplacement) > 0.0f;
-
-            bool vertexDisplacementObjectScaleEnable = material.GetFloat(kVertexDisplacementObjectScale) > 0.0;
-            SetKeyword(material, "_VERTEX_DISPLACEMENT_OBJECT_SCALE", vertexDisplacementObjectScaleEnable && enableVertexDisplacement);
+            SetKeyword(material, "_PIXEL_DISPLACEMENT", enablePixelDisplacement);
+            // Only set if tessellation exist
+            SetKeyword(material, "_TESSELLATION_DISPLACEMENT", enableTessellationDisplacement);
-            bool vertexDisplacementTilingScaleEnable = material.GetFloat(kVertexDisplacementTilingScale) > 0.0;
-            SetKeyword(material, "_VERTEX_DISPLACEMENT_TILING_SCALE", vertexDisplacementTilingScaleEnable && enableVertexDisplacement);
-
+            bool displacementLockObjectScale = material.GetFloat(kDisplacementLockObjectScale) > 0.0;
+            bool displacementLockTilingScale = material.GetFloat(kDisplacementLockTilingScale) > 0.0;
+            // Tessellation reuse vertex flag.
+            SetKeyword(material, "_VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE", displacementLockObjectScale && (enableVertexDisplacement || enableTessellationDisplacement));
+            SetKeyword(material, "_PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE", displacementLockObjectScale && enablePixelDisplacement);
+            SetKeyword(material, "_DISPLACEMENT_LOCK_TILING_SCALE", displacementLockTilingScale && enableDisplacement);
+         
+
+            // Depth offset is only enabled if per pixel displacement is
+            bool depthOffsetEnable = (material.GetFloat(kDepthOffsetEnable) > 0.0f) && enablePixelDisplacement;
+            SetKeyword(material, "_DEPTHOFFSET_ON", depthOffsetEnable);
 
             if (material.HasProperty(kTessellationMode))
             {

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs

-using System;
+using System;
 using UnityEngine;
 using UnityEngine.Experimental.Rendering;
 using UnityEngine.Experimental.Rendering.HDPipeline;
             public static GUIContent detailAlbedoScaleText = new GUIContent("Detail AlbedoScale", "Detail Albedo Scale factor");
             public static GUIContent detailNormalScaleText = new GUIContent("Detail NormalScale", "Normal Scale factor");
             public static GUIContent detailSmoothnessScaleText = new GUIContent("Detail SmoothnessScale", "Smoothness Scale factor");
+            public static GUIContent linkDetailsWithBaseText = new GUIContent("Lock to Base Tiling/Offset", "Lock details Tiling/Offset to Base Tiling/Offset");
 
             // Subsurface
             public static GUIContent subsurfaceProfileText = new GUIContent("Subsurface profile", "A profile determines the shape of the blur filter.");
             public static GUIContent normalMapSpaceWarning = new GUIContent("Object space normal can't be use with triplanar mapping.");
 
             // Transparency
-            public static string TransparencyInputsText = "Transparency Inputs";
             public static string refractionModeText = "Refraction Mode";
             public static GUIContent refractionIORText = new GUIContent("Indice of refraction", "Indice of refraction");
             public static GUIContent refractionThicknessText = new GUIContent("Refraction Thickness", "Thickness for rough refraction");
             public static GUIContent transmittanceColorText = new GUIContent("Transmittance Color", "Absorption color (RGB)");
             public static GUIContent atDistanceText = new GUIContent("Transmittance Absorption Distance", "Absorption distance reference");
+
+            public static GUIContent perPixelDisplacementDetailsWarning = new GUIContent("For pixel displacement to work correctly, details and base map must use same UV mapping");
         }
 
         // Lit shader is not layered but some layered materials inherit from it. In order to share code we need LitUI to account for this.
         protected const string kUVBase = "_UVBase";
         protected MaterialProperty[] TexWorldScale = new MaterialProperty[kMaxLayerCount];
         protected const string kTexWorldScale = "_TexWorldScale";
+        protected MaterialProperty[] InvTilingScale = new MaterialProperty[kMaxLayerCount];
+        protected const string kInvTilingScale = "_InvTilingScale";
         protected MaterialProperty[] UVMappingMask = new MaterialProperty[kMaxLayerCount];
         protected const string kUVMappingMask = "_UVMappingMask";
 
         protected const string kUVDetailsMappingMask = "_UVDetailsMappingMask";
         protected MaterialProperty[] detailMap = new MaterialProperty[kMaxLayerCount];
         protected const string kDetailMap = "_DetailMap";
+        protected MaterialProperty[] linkDetailsWithBase = new MaterialProperty[kMaxLayerCount];
+        protected const string kLinkDetailsWithBase = "_LinkDetailsWithBase";
         protected MaterialProperty[] detailAlbedoScale = new MaterialProperty[kMaxLayerCount];
         protected const string kDetailAlbedoScale = "_DetailAlbedoScale";
         protected MaterialProperty[] detailNormalScale = new MaterialProperty[kMaxLayerCount];
         protected MaterialProperty anisotropyMap = null;
         protected const string kAnisotropyMap = "_AnisotropyMap";
 
-        protected SubsurfaceScatteringProfile subsurfaceProfile = null;
         protected MaterialProperty subsurfaceProfileID  = null;
         protected const string     kSubsurfaceProfileID = "_SubsurfaceProfile";
         protected MaterialProperty subsurfaceRadius     = null;
             {
                 UVBase[i] = FindProperty(string.Format("{0}{1}", kUVBase, m_PropertySuffixes[i]), props);
                 TexWorldScale[i] = FindProperty(string.Format("{0}{1}", kTexWorldScale, m_PropertySuffixes[i]), props);
+                InvTilingScale[i] = FindProperty(string.Format("{0}{1}", kInvTilingScale, m_PropertySuffixes[i]), props);
                 UVMappingMask[i] = FindProperty(string.Format("{0}{1}", kUVMappingMask, m_PropertySuffixes[i]), props);
 
                 baseColor[i] = FindProperty(string.Format("{0}{1}", kBaseColor, m_PropertySuffixes[i]), props);
                 // Details
                 UVDetail[i] = FindProperty(string.Format("{0}{1}", kUVDetail, m_PropertySuffixes[i]), props);
                 UVDetailsMappingMask[i] = FindProperty(string.Format("{0}{1}", kUVDetailsMappingMask, m_PropertySuffixes[i]), props);
+                linkDetailsWithBase[i] = FindProperty(string.Format("{0}{1}", kLinkDetailsWithBase, m_PropertySuffixes[i]), props);
                 detailMap[i] = FindProperty(string.Format("{0}{1}", kDetailMap, m_PropertySuffixes[i]), props);
                 detailAlbedoScale[i] = FindProperty(string.Format("{0}{1}", kDetailAlbedoScale, m_PropertySuffixes[i]), props);
                 detailNormalScale[i] = FindProperty(string.Format("{0}{1}", kDetailNormalScale, m_PropertySuffixes[i]), props);
 
         protected void ShaderSSSInputGUI(Material material)
         {
-            HDRenderPipeline hdPipeline = RenderPipelineManager.currentPipeline as HDRenderPipeline;
+            var hdPipeline = RenderPipelineManager.currentPipeline as HDRenderPipeline;
+            var sssSettings = hdPipeline.sssSettings;
-            if (subsurfaceProfile == null)
+            if (sssSettings == null)
-                // Attempt to load the profile from the SSS Settings.
-                int profileID = (int)subsurfaceProfileID.floatValue;
+                EditorGUILayout.HelpBox("No Subsurface Scattering Settings have been assigned to the render pipeline asset.", MessageType.Warning);
+                return;
+            }
-                if (0 <= profileID && profileID < hdPipeline.sssSettings.profiles.Length &&
-                    hdPipeline.sssSettings.profiles[profileID] != null)
-                {
-                    // This is a valid profile ID.
-                    subsurfaceProfile = hdPipeline.sssSettings.profiles[profileID];
+            // TODO: Optimize me
+            var profiles = hdPipeline.sssSettings.profiles;
+            var names = new GUIContent[profiles.Length + 1];
+            names[0] = new GUIContent("None");
+
+            var values = new int[names.Length];
+            values[0] = SssConstants.SSS_NEUTRAL_PROFILE_ID;
-                    // Refresh the ID of the profile.
-                    hdPipeline.sssSettings.OnValidate();
-                }
+            for (int i = 0; i < profiles.Length; i++)
+            {
+                names[i + 1] = new GUIContent(profiles[i].name);
+                values[i + 1] = i;
-            subsurfaceProfile = EditorGUILayout.ObjectField(Styles.subsurfaceProfileText, subsurfaceProfile, typeof(SubsurfaceScatteringProfile), false) as SubsurfaceScatteringProfile;
-
-            bool validProfile = false;
-
-            // Set the profile ID.
-            if (subsurfaceProfile != null)
+            using (var scope = new EditorGUI.ChangeCheckScope())
-                // Load the profile from the GUI field.
-                int profileID = subsurfaceProfile.settingsIndex;
+                int profileID = (int)subsurfaceProfileID.floatValue;
-                if (0 <= profileID && profileID < hdPipeline.sssSettings.profiles.Length &&
-                    hdPipeline.sssSettings.profiles[profileID] != null &&
-                    hdPipeline.sssSettings.profiles[profileID] == subsurfaceProfile)
-                {
-                    validProfile = true;
-                    material.SetInt("_SubsurfaceProfile", profileID);
-                }
-                else
+                using (new EditorGUILayout.HorizontalScope())
-                    subsurfaceProfile = null;
-                    Debug.LogError("The SSS Profile assigned to the material has an invalid index. First, add the Profile to the SSS Settings, and then reassign it to the material.");
+                    EditorGUILayout.PrefixLabel(Styles.subsurfaceProfileText);
+
+                    using (new EditorGUILayout.HorizontalScope())
+                    {
+                        profileID = EditorGUILayout.IntPopup(profileID, names, values);
+
+                        if (GUILayout.Button("Goto", EditorStyles.miniButton, GUILayout.Width(50f)))
+                            Selection.activeObject = sssSettings;
+                    }
-            }
-            if (!validProfile)
-            {
-                // Disable SSS for this object.
-                material.SetInt("_SubsurfaceProfile", SssConstants.SSS_NEUTRAL_PROFILE_ID);
+                if (scope.changed)
+                    subsurfaceProfileID.floatValue = profileID;
             }
 
             m_MaterialEditor.ShaderProperty(subsurfaceRadius, Styles.subsurfaceRadiusText);
             if (!heightMap[layerIndex].hasMixedValue && heightMap[layerIndex].textureValue != null)
             {
                 EditorGUI.indentLevel++;
+                EditorGUI.BeginChangeCheck();
-                heightAmplitude[layerIndex].floatValue = (heightMax[layerIndex].floatValue - heightMin[layerIndex].floatValue) * 0.01f; // Conversion centimeters to meters.
+                if (EditorGUI.EndChangeCheck())
+                {
+                    heightAmplitude[layerIndex].floatValue = (heightMax[layerIndex].floatValue - heightMin[layerIndex].floatValue) * 0.01f; // Conversion centimeters to meters.
+                }
                 m_MaterialEditor.ShaderProperty(heightCenter[layerIndex], Styles.heightMapCenterText);
                 EditorGUI.showMixedValue = false;
                 EditorGUI.indentLevel--;
             }
 
             EditorGUILayout.Space();
+
+            EditorGUI.BeginChangeCheck();
             m_MaterialEditor.ShaderProperty(UVBase[layerIndex], Styles.UVBaseMappingText);
 
             UVBaseMapping uvBaseMapping = (UVBaseMapping)UVBase[layerIndex].floatValue;
             W = (uvBaseMapping == UVBaseMapping.UV3) ? 1.0f : 0.0f;
 
             UVMappingMask[layerIndex].colorValue = new Color(X, Y, Z, W);
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                // Precompute.
+                InvTilingScale[layerIndex].floatValue = 2.0f / (Mathf.Abs(baseColorMap[layerIndex].textureScaleAndOffset.x) + Mathf.Abs(baseColorMap[layerIndex].textureScaleAndOffset.y));
+                if ((uvBaseMapping == UVBaseMapping.Planar) || (uvBaseMapping == UVBaseMapping.Triplanar))
+                {
+                    InvTilingScale[layerIndex].floatValue = InvTilingScale[layerIndex].floatValue / TexWorldScale[layerIndex].floatValue;
+                }
+            }
 
             EditorGUI.indentLevel--;
             EditorGUILayout.Space();
             else
             {
                 m_MaterialEditor.ShaderProperty(UVDetail[layerIndex], Styles.UVDetailMappingText);
-            }
+            }            
 
             // Setup the UVSet for detail, if planar/triplanar is use for base, it will override the mapping of detail (See shader code)
             X = ((UVDetailMapping)UVDetail[layerIndex].floatValue == UVDetailMapping.UV0) ? 1.0f : 0.0f;
             UVDetailsMappingMask[layerIndex].colorValue = new Color(X, Y, Z, W);
 
+            EditorGUI.indentLevel++;
+            m_MaterialEditor.ShaderProperty(linkDetailsWithBase[layerIndex], Styles.linkDetailsWithBaseText);
+            EditorGUI.indentLevel--;
+            if ((DisplacementMode)displacementMode.floatValue == DisplacementMode.Pixel && (UVDetail[layerIndex].floatValue != UVBase[layerIndex].floatValue))
+            {
+                if (material.GetTexture(kDetailMap + m_PropertySuffixes[layerIndex]))
+                    EditorGUILayout.HelpBox(Styles.perPixelDisplacementDetailsWarning.text, MessageType.Warning);
+            }
             m_MaterialEditor.ShaderProperty(detailAlbedoScale[layerIndex], Styles.detailAlbedoScaleText);
             m_MaterialEditor.ShaderProperty(detailNormalScale[layerIndex], Styles.detailNormalScaleText);
             m_MaterialEditor.ShaderProperty(detailSmoothnessScale[layerIndex], Styles.detailSmoothnessScaleText);
                 && refractionMode != null)
             {
                 EditorGUILayout.Space();
-                EditorGUILayout.LabelField(Styles.TransparencyInputsText, EditorStyles.boldLabel);
+                EditorGUILayout.LabelField(StylesBaseUnlit.TransparencyInputsText, EditorStyles.boldLabel);
-                m_MaterialEditor.ShaderProperty(refractionMode, Styles.refractionModeText);
-                var mode = (Lit.RefractionMode)refractionMode.floatValue;
-                if (mode != Lit.RefractionMode.None)
+                if (refractionMode != null)
-                    m_MaterialEditor.ShaderProperty(ior, Styles.refractionIORText);
-
-                    if (mode != Lit.RefractionMode.ThinPlane)
+                    m_MaterialEditor.ShaderProperty(refractionMode, Styles.refractionModeText);
+                    var mode = (Lit.RefractionMode)refractionMode.floatValue;
+                    if (mode != Lit.RefractionMode.None)
-                        if (thicknessMap.textureValue == null)
-                            m_MaterialEditor.ShaderProperty(thickness, Styles.refractionThicknessText);
-                        m_MaterialEditor.TexturePropertySingleLine(Styles.refractionThicknessMapText, thicknessMap);
+                        ++EditorGUI.indentLevel;
+
+                        m_MaterialEditor.ShaderProperty(ior, Styles.refractionIORText);
+
+                        if (mode != Lit.RefractionMode.ThinPlane)
+                        {
+                            if (thicknessMap.textureValue == null)
+                                m_MaterialEditor.ShaderProperty(thickness, Styles.refractionThicknessText);
+                            m_MaterialEditor.TexturePropertySingleLine(Styles.refractionThicknessMapText, thicknessMap);
+                            ++EditorGUI.indentLevel;
+                            m_MaterialEditor.ShaderProperty(thicknessMultiplier, Styles.refractionThicknessMultiplierText);
+                            --EditorGUI.indentLevel;
+                        }
+
+                        m_MaterialEditor.ShaderProperty(transmittanceColor, Styles.transmittanceColorText);
-                        m_MaterialEditor.ShaderProperty(thicknessMultiplier, Styles.refractionThicknessMultiplierText);
+                        m_MaterialEditor.ShaderProperty(atDistance, Styles.atDistanceText);
+                        --EditorGUI.indentLevel;
+
+                }
+
+                DoDistortionInputsGUI();
-                    m_MaterialEditor.ShaderProperty(transmittanceColor, Styles.transmittanceColorText);
-                    ++EditorGUI.indentLevel;
-                    m_MaterialEditor.ShaderProperty(atDistance, Styles.atDistanceText);
-                    --EditorGUI.indentLevel;
-                }
                 --EditorGUI.indentLevel;
             }
         }
             // TODO: display warning if we don't have bent normal (either OS or TS) and ambient occlusion
             //if (enableSpecularOcclusion.floatValue > 0.0f)
             {
-                //EditorGUILayout.HelpBox(Styles.specularOcclusionWarning.text, MessageType.Error);                
+                //EditorGUILayout.HelpBox(Styles.specularOcclusionWarning.text, MessageType.Error);
-            EditorGUI.indentLevel++;            
+            EditorGUI.indentLevel++;
             m_MaterialEditor.TexturePropertySingleLine(Styles.emissiveText, emissiveColorMap, emissiveColor);
             m_MaterialEditor.ShaderProperty(emissiveIntensity, Styles.emissiveIntensityText);
             m_MaterialEditor.ShaderProperty(albedoAffectEmissive, Styles.albedoAffectEmissiveText);

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/SubsurfaceScatteringSettingsEditor.Styles.cs

 
 namespace UnityEditor.Experimental.Rendering.HDPipeline
 {
-    partial class SubsurfaceScatteringProfileEditor
+    public sealed partial class SubsurfaceScatteringSettingsEditor
+        // TODO: missing tooltips
+            public readonly GUIContent   useDisneySSS              = new GUIContent("Use Disney SSS");
+
             public readonly GUIContent   profilePreview0           = new GUIContent("Profile Preview");
             public readonly GUIContent   profilePreview1           = new GUIContent("Shows the fraction of light scattered from the source (center).");
             public readonly GUIContent   profilePreview2           = new GUIContent("The distance to the boundary of the image corresponds to the Max Radius.");

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl

 // Color pyramid (width, height, lodcount, Unused)
 float4 _GaussianPyramidColorMipSize;
 TEXTURE2D(_GaussianPyramidColorTexture);
-SAMPLER2D(sampler_GaussianPyramidColorTexture);
-SAMPLER2D(sampler_PyramidDepthTexture);
+SamplerState ltc_trilinear_clamp_sampler;
 // TODO: This one should be set into a constant Buffer at pass frequency (with _Screensize)
 TEXTURE2D(_PreIntegratedFGD);
 TEXTURE2D_ARRAY(_LtcData); // We pack the 3 Ltc data inside a texture array
     // Encode normal on 20bit with oct compression + 2bit of sign
     float2 octNormalWS = PackNormalOctEncode((surfaceData.materialId == MATERIALID_LIT_CLEAR_COAT) ? surfaceData.coatNormalWS : surfaceData.normalWS);
     // To have more precision encode the sign of xy in a separate uint
-    uint octNormalSign = (octNormalWS.x > 0.0 ? 1 : 0) + (octNormalWS.y > 0.0 ? 2 : 0);
+    uint octNormalSign = (octNormalWS.x < 0.0 ? 1 : 0) | (octNormalWS.y < 0.0 ? 2 : 0);
     // Store octNormalSign on two bits with perceptualRoughness
     outGBuffer1 = float4(abs(octNormalWS), PackFloatInt10bit(PerceptualSmoothnessToPerceptualRoughness(surfaceData.perceptualSmoothness), octNormalSign, 4.0), PackMaterialId(surfaceData.materialId));
 
     {
         // Encode tangent on 16bit with oct compression
         float2 octTangentWS = PackNormalOctEncode(surfaceData.tangentWS);
-            outGBuffer2 = float4(octTangentWS * 0.5 + 0.5, surfaceData.anisotropy, PackFloatInt8bit(surfaceData.metallic, 0.0, 4.0));
+        // To have more precision encode the sign of xy in a separate uint
+        uint octTangentSign = (octTangentWS.x < 0.0 ? 1 : 0) | (octTangentWS.y < 0.0 ? 2 : 0);
+
+        outGBuffer2 = float4(abs(octTangentWS), surfaceData.anisotropy * 0.5 + 0.5, PackFloatInt8bit(surfaceData.metallic, octTangentSign, 4.0));
     }
     else if (surfaceData.materialId == MATERIALID_LIT_CLEAR_COAT)
     {
 
     int octNormalSign;
     UnpackFloatInt10bit(inGBuffer1.b, 4.0, bsdfData.perceptualRoughness, octNormalSign);
-    inGBuffer1.r *= (octNormalSign & 1) ? 1.0 : -1.0;
-    inGBuffer1.g *= (octNormalSign & 2) ? 1.0 : -1.0;
+    inGBuffer1.r = (octNormalSign & 1) ? -inGBuffer1.r : inGBuffer1.r;
+    inGBuffer1.g = (octNormalSign & 2) ? -inGBuffer1.g : inGBuffer1.g;
+
     bsdfData.normalWS = UnpackNormalOctEncode(float2(inGBuffer1.r, inGBuffer1.g));
 
     bsdfData.roughness = PerceptualRoughnessToRoughness(bsdfData.perceptualRoughness);
     else if (bsdfData.materialId == MATERIALID_LIT_ANISO && HasMaterialFeatureFlag(MATERIALFEATUREFLAGS_LIT_ANISO))
     {
         float metallic;
-        int unused;
-        UnpackFloatInt8bit(inGBuffer2.a, 4.0, metallic, unused);
+        int octTangentSign;
+        UnpackFloatInt8bit(inGBuffer2.a, 4.0, metallic, octTangentSign);
-        float3 tangentWS = UnpackNormalOctEncode(float2(inGBuffer2.rg * 2.0 - 1.0));
-        float anisotropy = inGBuffer2.b;
+        inGBuffer2.r = (octTangentSign & 1) ? -inGBuffer2.r : inGBuffer2.r;
+        inGBuffer2.g = (octTangentSign & 2) ? -inGBuffer2.g : inGBuffer2.g;
+        float3 tangentWS = UnpackNormalOctEncode(inGBuffer2.rg);
+        float anisotropy = inGBuffer2.b * 2 - 1;
+
         FillMaterialIdAnisoData(bsdfData.roughness, bsdfData.normalWS, tangentWS, anisotropy, bsdfData);
     }
     else if (bsdfData.materialId == MATERIALID_LIT_CLEAR_COAT && HasMaterialFeatureFlag(MATERIALFEATUREFLAGS_LIT_CLEAR_COAT))
     float NdotV;                         // Geometric version (could be negative)
 
     // GGX iso
-    float ggxLambdaV;
+    float ggxPreLambdaV;
-    float anisoGGXLambdaV;
+    float anisoGGXPreLambdaV;
 
     // Clear coat
     float coatNdotV;
         // Clear coat IBL
 
         // In the case of IBL we want  shift a bit the normal that are not toward the viewver to reduce artifact
-        float3 coatIblNormalWS = GetViewShiftedNormal(bsdfData.coatNormalWS, V, preLightData.coatNdotV, MIN_N_DOT_V);
+        float3 coatIblNormalWS = GetViewShiftedNormal(bsdfData.coatNormalWS, V, preLightData.coatNdotV, MIN_N_DOT_V); // Use non-clamped NdotV
+        float coatNdotV = max(preLightData.coatNdotV, MIN_N_DOT_V); // Use the modified (clamped) version
+
-        float theta = FastACos(preLightData.coatNdotV);
+        float theta = FastACosPos(coatNdotV);
         float2 uv = LTC_LUT_OFFSET + LTC_LUT_SCALE * float2(0.0, theta * INV_HALF_PI); // Use Roughness of 0.0 for clearCoat roughness
 
                                                                                        // Get the inverse LTC matrix for GGX
     }
 
     preLightData.NdotV = dot(bsdfData.normalWS, V); // Store the unaltered (geometric) version
-    float NdotV = preLightData.NdotV;
-    float3 iblNormalWS = GetViewShiftedNormal(bsdfData.normalWS, V, NdotV, MIN_N_DOT_V); // Use non clamped NdotV
+    float3 iblNormalWS = GetViewShiftedNormal(bsdfData.normalWS, V, preLightData.NdotV, MIN_N_DOT_V); // Use non-clamped NdotV
-    NdotV = max(NdotV, MIN_N_DOT_V); // Use the modified (clamped) version
+    float NdotV = max(preLightData.NdotV, MIN_N_DOT_V); // Use the modified (clamped) version
-    preLightData.ggxLambdaV = GetSmithJointGGXLambdaV(NdotV, bsdfData.roughness);
+    preLightData.ggxPreLambdaV = GetSmithJointGGXPreLambdaV(NdotV, bsdfData.roughness);
 
     // GGX aniso
     preLightData.TdotV = 0.0;
         preLightData.TdotV = dot(bsdfData.tangentWS, V);
         preLightData.BdotV = dot(bsdfData.bitangentWS, V);
-        preLightData.anisoGGXLambdaV = GetSmithJointGGXAnisoLambdaV(preLightData.TdotV, preLightData.BdotV, NdotV, bsdfData.roughnessT, bsdfData.roughnessB);
-        // Tangent = highlight stretch (anisotropy) direction. Bitangent = grain (brush) direction.
-        float3 anisoIblNormalWS = GetAnisotropicModifiedNormal(bsdfData.bitangentWS, iblNormalWS, V, bsdfData.anisotropy);
+        preLightData.anisoGGXPreLambdaV = GetSmithJointGGXAnisoPreLambdaV(preLightData.TdotV, preLightData.BdotV, NdotV, bsdfData.roughnessT, bsdfData.roughnessB);
+        // For positive anisotropy values: tangent = highlight stretch (anisotropy) direction, bitangent = grain (brush) direction.
+        float3 grainDirWS = (bsdfData.anisotropy >= 0) ? bsdfData.bitangentWS : bsdfData.tangentWS;
+        float3 anisoIblNormalWS = GetAnisotropicModifiedNormal(grainDirWS, iblNormalWS, V, abs(bsdfData.anisotropy));
 
         // NOTE: If we follow the theory we should use the modified normal for the different calculation implying a normal (like NdotV) and use iblNormalWS
         // into function like GetSpecularDominantDir(). However modified normal is just a hack. The goal is just to stretch a cubemap, no accuracy here.
 
     // Area light
     // UVs for sampling the LUTs
-    float theta = FastACos(NdotV); // For Area light - UVs for sampling the LUTs
+    float theta = FastACosPos(NdotV); // For Area light - UVs for sampling the LUTs
     float2 uv = LTC_LUT_OFFSET + LTC_LUT_SCALE * float2(bsdfData.perceptualRoughness, theta * INV_HALF_PI);
 
     // Note we load the matrix transpose (avoid to have to transpose it in shader)
 
     F *= F_Schlick(bsdfData.fresnel0, LdotH);
 
-    float Vis;
-    float D;
+    float DV;
 
     if (bsdfData.materialId == MATERIALID_LIT_ANISO && HasMaterialFeatureFlag(MATERIALFEATUREFLAGS_LIT_ANISO))
     {
         bsdfData.roughnessT = ClampRoughnessForAnalyticalLights(bsdfData.roughnessT);
         bsdfData.roughnessB = ClampRoughnessForAnalyticalLights(bsdfData.roughnessB);
 
+        // TODO: Do comparison between this correct version and the one from isotropic and see if there is any visual difference
+        DV = DV_SmithJointGGXAniso(TdotH, BdotH, NdotH,
+                                   preLightData.TdotV, preLightData.BdotV, preLightData.NdotV,
+                                   TdotL, BdotL, NdotL,
+                                   bsdfData.roughnessT, bsdfData.roughnessB
-        Vis = V_SmithJointGGXAnisoLambdaV(preLightData.TdotV, preLightData.BdotV, NdotV, TdotL, BdotL, NdotL,
-                                          bsdfData.roughnessT, bsdfData.roughnessB, preLightData.anisoGGXLambdaV);
+                                 , preLightData.preLambdaV);
-        // TODO: Do comparison between this correct version and the one from isotropic and see if there is any visual difference
-        Vis = V_SmithJointGGXAniso(preLightData.TdotV, preLightData.BdotV, NdotV, TdotL, BdotL, NdotL,
-                                   bsdfData.roughnessT, bsdfData.roughnessB);
+                                   );
-
-        D = D_GGXAniso(TdotH, BdotH, NdotH, bsdfData.roughnessT, bsdfData.roughnessB);
+        DV = DV_SmithJointGGX(NdotH, NdotL, NdotV, bsdfData.roughness
-        Vis = V_SmithJointGGX(NdotL, NdotV, bsdfData.roughness, preLightData.ggxLambdaV);
+                            , preLightData preLambdaV);
-        Vis = V_SmithJointGGX(NdotL, NdotV, bsdfData.roughness);
+                              );
-        D = D_GGX(NdotH, bsdfData.roughness);
-    specularLighting += F * (Vis * D);
+    specularLighting += F * DV;
-    float3 diffuseTerm = DiffuseGGX(bsdfData.diffuseColor, NdotV, NdotL, NdotH, LdotV, bsdfData.perceptualRoughness);
+    float3 diffuseTerm = DiffuseGGX(bsdfData.diffuseColor, NdotV, NdotL, NdotH, LdotV, bsdfData.roughness);
-    float  diffuseTerm = DisneyDiffuse(NdotV, NdotL, LdotH, bsdfData.perceptualRoughness);
+    float  diffuseTerm = DisneyDiffuse(NdotV, NdotL, LdotV, bsdfData.perceptualRoughness);
 #endif
 
     diffuseLighting = bsdfData.diffuseColor * diffuseTerm;
     float3 refractedBackPointWS = float3(0.0, 0.0, 0.0);
     float opticalDepth = 0.0;
 
+    uint2 depthSize = uint2(_PyramidDepthMipSize.xy);
+
     // For all refraction approximation, to calculate the refracted point in world space,
     //   we approximate the scene as a plane (back plane) with normal -V at the depth hit point.
     //   (We avoid to raymarch the depth texture to get the refracted point.)
     float3 R = refract(-V, bsdfData.normalWS, 1.0 / bsdfData.ior);
 
     // Get the depth of the approximated back plane
-    float pyramidDepth = SAMPLE_TEXTURE2D_LOD(_PyramidDepthTexture, sampler_PyramidDepthTexture, posInput.positionSS, 2.0).r;
+    float pyramidDepth = LOAD_TEXTURE2D_LOD(_PyramidDepthTexture, posInput.positionSS * (depthSize >> 2), 2).r;
     float depth = LinearEyeDepth(pyramidDepth, _ZBufferParams);
 
     // Distance from point to the back plane
     //  So the light is refracted twice: in and out of the tangent sphere
 
     // Get the depth of the approximated back plane
-    float pyramidDepth = SAMPLE_TEXTURE2D_LOD(_PyramidDepthTexture, sampler_PyramidDepthTexture, posInput.positionSS, 2.0).r;
+    float pyramidDepth = LOAD_TEXTURE2D_LOD(_PyramidDepthTexture, posInput.positionSS * (depthSize >> 2), 2).r;
     float depth = LinearEyeDepth(pyramidDepth, _ZBufferParams);
 
     // Distance from point to the back plane
     float3 R = refract(-V, bsdfData.normalWS, 1.0 / bsdfData.ior);
 
     // Get the depth of the approximated back plane
-    float pyramidDepth = SAMPLE_TEXTURE2D_LOD(_PyramidDepthTexture, sampler_PyramidDepthTexture, posInput.positionSS, 2.0).r;
+    float pyramidDepth = LOAD_TEXTURE2D_LOD(_PyramidDepthTexture, posInput.positionSS * (depthSize >> 2), 2).r;
     float depth = LinearEyeDepth(pyramidDepth, _ZBufferParams);
 
     // Distance from point to the back plane
     // Calculate screen space coordinates of refracted point in back plane
     float4 refractedBackPointCS = mul(_ViewProjMatrix, float4(refractedBackPointWS, 1.0));
     float2 refractedBackPointSS = ComputeScreenSpacePosition(refractedBackPointCS);
-    float refractedBackPointDepth = LinearEyeDepth(SAMPLE_TEXTURE2D_LOD(_PyramidDepthTexture, sampler_PyramidDepthTexture, refractedBackPointSS, 0.0).r, _ZBufferParams);
+    float refractedBackPointDepth = LinearEyeDepth(LOAD_TEXTURE2D_LOD(_PyramidDepthTexture, refractedBackPointSS * depthSize, 0).r, _ZBufferParams);
 
     // Exit if texel is out of color buffer
     // Or if the texel is from an object in front of the object
     {
-        diffuseLighting = SAMPLE_TEXTURE2D_LOD(_GaussianPyramidColorTexture, sampler_GaussianPyramidColorTexture, posInput.positionSS, 0.0).rgb;
+        diffuseLighting = SAMPLE_TEXTURE2D_LOD(_GaussianPyramidColorTexture, ltc_trilinear_clamp_sampler, posInput.positionSS, 0.0).rgb;
-    float mipLevel = PerceptualRoughnessToMipmapLevel(bsdfData.perceptualRoughness);
-    diffuseLighting = SAMPLE_TEXTURE2D_LOD(_GaussianPyramidColorTexture, sampler_GaussianPyramidColorTexture, refractedBackPointSS.xy, mipLevel).rgb;
+    float mipLevel = PerceptualRoughnessToMipmapLevel(bsdfData.perceptualRoughness, uint(_GaussianPyramidColorMipSize.z));
+    diffuseLighting = SAMPLE_TEXTURE2D_LOD(_GaussianPyramidColorTexture, ltc_trilinear_clamp_sampler, refractedBackPointSS, mipLevel).rgb;
 
     // Beer-Lamber law for absorption
     float3 transmittance = exp(-bsdfData.absorptionCoefficient * opticalDepth);
     // Use perfect flat transparency when we cannot fetch the correct pixel color for the refracted point
-    diffuseLighting = SAMPLE_TEXTURE2D_LOD(_GaussianPyramidColorTexture, sampler_GaussianPyramidColorTexture, posInput.positionSS, 0.0).rgb;
+    diffuseLighting = SAMPLE_TEXTURE2D_LOD(_GaussianPyramidColorTexture, ltc_trilinear_clamp_sampler, posInput.positionSS, 0.0).rgb;
 #endif
 }
 

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader

         _HeightCenter("Height Center", Range(0.0, 1.0)) = 0.5 // In texture space
 
         _DetailMap("DetailMap", 2D) = "black" {}
-        _DetailAlbedoScale("_DetailAlbedoScale", Range(-2.0, 2.0)) = 1
+        _DetailAlbedoScale("_DetailAlbedoScale", Range(0.0, 2.0)) = 1
-        _DetailSmoothnessScale("_DetailSmoothnessScale", Range(-2.0, 2.0)) = 1
+        _DetailSmoothnessScale("_DetailSmoothnessScale", Range(0.0, 2.0)) = 1
-        _Anisotropy("Anisotropy", Range(0.0, 1.0)) = 0
+        _Anisotropy("Anisotropy", Range(-1.0, 1.0)) = 0
         _AnisotropyMap("AnisotropyMap", 2D) = "white" {}
 
         _SubsurfaceProfile("Subsurface Profile", Int) = 0
         [ToggleOff] _DistortionOnly("Distortion Only", Float) = 0.0
         [ToggleOff] _DistortionDepthTest("Distortion Depth Test Enable", Float) = 0.0
         [ToggleOff] _DepthOffsetEnable("Depth Offset View space", Float) = 0.0
+        [Enum(Add, 0, Multiply, 1)] _DistortionBlendMode("Distortion Blend Mode", Int) = 0
+        [HideInInspector] _DistortionSrcBlend("Distortion Blend Src", Int) = 0
+        [HideInInspector] _DistortionDstBlend("Distortion Blend Dst", Int) = 0
+        [HideInInspector] _DistortionBlurSrcBlend("Distortion Blur Blend Src", Int) = 0
+        [HideInInspector] _DistortionBlurDstBlend("Distortion Blur Blend Dst", Int) = 0
+        [HideInInspector] _DistortionBlurBlendMode("Distortion Blur Blend Mode", Int) = 0
+        _DistortionScale("Distortion Scale", Float) = 1
+        _DistortionBlurScale("Distortion Blur Scale", Float) = 1
+        _DistortionBlurRemapMin("DistortionBlurRemapMin", Float) = 0.0
+        _DistortionBlurRemapMax("DistortionBlurRemapMax", Float) = 1.0
 
         [ToggleOff]  _AlphaCutoffEnable("Alpha Cutoff Enable", Float) = 0.0
         _AlphaCutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
 
         [Enum(UV0, 0, Planar, 4, TriPlanar, 5)] _UVBase("UV Set for base", Float) = 0
         _TexWorldScale("Scale to apply on world coordinate", Float) = 1.0
+        [HideInInspector] _InvTilingScale("Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y))", Float) = 1
-        [ToggleOff]  _EnablePerPixelDisplacement("Enable per pixel displacement", Float) = 0.0
+        [Enum(None, 0, Vertex displacement, 1, Pixel displacement, 2)] _DisplacementMode("DisplacementMode", Int) = 0
+        [ToggleOff] _DisplacementLockObjectScale("displacement lock object scale", Float) = 1.0
+        [ToggleOff] _DisplacementLockTilingScale("displacement lock tiling scale", Float) = 1.0
+
-        [ToggleOff] _PerPixelDisplacementObjectScale("Per pixel displacement object scale", Float) = 1.0
+        _PPDPrimitiveLength("Primitive length for POM", Float) = 1
+        _PPDPrimitiveWidth("Primitive width for POM", Float) = 1
+        [HideInInspector] _InvPrimScale("Inverse primitive scale for non-planar POM", Vector) = (1, 1, 0, 0)
+        [ToggleOff] _LinkDetailsWithBase("LinkDetailsWithBase", Float) = 1.0
-
-        // Displacement map
-        [ToggleOff] _EnableVertexDisplacement("Enable vertex displacement", Float) = 0.0
-        [ToggleOff] _VertexDisplacementObjectScale("Vertex displacement object scale", Float) = 1.0
-        [ToggleOff] _VertexDisplacementTilingScale("Vertex displacement tiling height scale", Float) = 1.0
 
         // Wind
         [ToggleOff]  _EnableWind("Enable Wind", Float) = 0.0
     #pragma shader_feature _ALPHATEST_ON
     #pragma shader_feature _DEPTHOFFSET_ON
     #pragma shader_feature _DOUBLESIDED_ON
-    #pragma shader_feature _PER_PIXEL_DISPLACEMENT
-    #pragma shader_feature _PER_PIXEL_DISPLACEMENT_OBJECT_SCALE
-    #pragma shader_feature _VERTEX_DISPLACEMENT
-    #pragma shader_feature _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    #pragma shader_feature _VERTEX_DISPLACEMENT_TILING_SCALE
+    #pragma shader_feature _ _VERTEX_DISPLACEMENT _PIXEL_DISPLACEMENT
+    #pragma shader_feature _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE
+    #pragma shader_feature _DISPLACEMENT_LOCK_TILING_SCALE
+    #pragma shader_feature _PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE
     #pragma shader_feature _VERTEX_WIND
     #pragma shader_feature _ _REFRACTION_THINPLANE _REFRACTION_THICKPLANE _REFRACTION_THICKSPHERE
 
             Name "Distortion" // Name is not used
             Tags { "LightMode" = "DistortionVectors" } // This will be only for transparent object based on the RenderQueue index
 
-            Blend One One
+            Blend [_DistortionSrcBlend] [_DistortionDstBlend], [_DistortionBlurSrcBlend] [_DistortionBlurDstBlend]
+            BlendOp Add, [_DistortionBlurBlendOp]
             ZTest [_ZTestMode]
             ZWrite off
             Cull [_CullMode]

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl

 {
     // For Deferred:
     // If we have a prepass, we need to remove the clip from the GBuffer pass (otherwise HiZ does not work on PS4)
-    // For Forward (Full forward or ForwardOnlyOpaque in deferred):
+    // For Forward
-    #if ((SHADER_PASS == SHADERPASS_GBUFFER) && !defined(_BYPASS_ALPHA_TEST)) || (SHADER_PASS == SHADERPASS_FORWARD && defined(SURFACE_TYPE_TRANSPARENT))
-        clip(alpha - alphaCutoff);
-    #endif
+#if !(SHADERPASS == SHADERPASS_FORWARD && defined(SURFACE_TYPE_OPAQUE)) && !(SHADERPASS == SHADERPASS_GBUFFER && defined(_BYPASS_ALPHA_TEST))
+    clip(alpha - alphaCutoff);
+#endif
 }
 
 // TODO: move this function to commonLighting.hlsl once validated it work correctly
 
 #if (SHADERPASS == SHADERPASS_DISTORTION)
     float3 distortion = SAMPLE_TEXTURE2D(_DistortionVectorMap, sampler_DistortionVectorMap, input.texCoord0).rgb;
-    builtinData.distortion = distortion.rg;
-    builtinData.distortionBlur = distortion.b;
+    builtinData.distortion = distortion.rg * _DistortionScale;
+    builtinData.distortionBlur = clamp(distortion.b * _DistortionBlurScale, 0.0, 1.0) * (_DistortionBlurRemapMax - _DistortionBlurRemapMin) + _DistortionBlurRemapMin;
 #else
     builtinData.distortion = float2(0.0, 0.0);
     builtinData.distortionBlur = 0.0;
 }
 #endif
 
+// Share by Lit and LayeredLit. Return object scaling for displacement map depends if it is vertex (affect vertex displacement) or pixel displacement (affect tiling)
+float3 GetDisplacementObjectScale(bool vertexDisplacement)
+{
+    float3 objectScale = float3(1.0, 1.0, 1.0);
+    // TODO: This should be an uniform for the object, this code should be remove once we have it. - Workaround for now
+    // To handle object scaling with pixel displacement we need to multiply the view vector by the inverse scale.
+    // To Handle object scaling with vertex/tessellation displacement we must multiply displacement by object scale
+    // Currently we extract either the scale (ObjectToWorld) or the inverse scale (worldToObject) directly by taking the transform matrix
+    float4x4 worldTransform;
+    if (vertexDisplacement)
+    {
+        worldTransform = GetObjectToWorldMatrix();
+    }
+
+    else
+    {
+        worldTransform = GetWorldToObjectMatrix();
+    }
+
+    objectScale.x = length(float3(worldTransform._m00, worldTransform._m01, worldTransform._m02));
+    // In the specific case of pixel displacement mapping, to get a consistent behavior compare to tessellation we require to not take into account y scale if lock object scale is not enabled
+#if !defined(_PIXEL_DISPLACEMENT) || (defined(_PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE))
+    objectScale.y = length(float3(worldTransform._m10, worldTransform._m11, worldTransform._m12));
+#endif
+    objectScale.z = length(float3(worldTransform._m20, worldTransform._m21, worldTransform._m22));
+
+    return objectScale;
+}
 
 #ifndef LAYERED_LIT_SHADER
 
 
     // Be sure that the compiler is aware that we don't use UV1 to UV3 for main layer so it can optimize code
     ComputeLayerTexCoord(   texCoord0, texCoord1, texCoord2, texCoord3, float4(1.0, 0.0, 0.0, 0.0), _UVDetailsMappingMask,
-                            _BaseColorMap_ST.xy, _BaseColorMap_ST.zw, _DetailMap_ST.xy, _DetailMap_ST.zw, 1.0,
+                            _BaseColorMap_ST.xy, _BaseColorMap_ST.zw, _DetailMap_ST.xy, _DetailMap_ST.zw, 1.0, _LinkDetailsWithBase,
                             positionWS, _TexWorldScale,
                             mappingType, layerTexCoord);
 }
     float2 uv;
 };
 
-// Calculate displacement for per vertex displacement mapping
 float ComputePerPixelHeightDisplacement(float2 texOffsetCurrent, float lod, PerPixelHeightDisplacementParam param)
 {
     // Note: No multiply by amplitude here. This is include in the maxHeight provide to POM
 
 #include "../../../Core/ShaderLibrary/PerPixelDisplacement.hlsl"
 
+void ApplyDisplacementTileScale(inout float height)
+{
+    // Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y)
+    // Inverse tiling scale *= (1 / _TexWorldScale) if planar or triplanar
+#ifdef _DISPLACEMENT_LOCK_TILING_SCALE
+    height *= _InvTilingScale;
+#endif
+}
+
-    bool ppdEnable = false;
-    bool isPlanar = false;
-    bool isTriplanar = false;
+#if defined(_PIXEL_DISPLACEMENT) && defined(_HEIGHTMAP)
+    // These variables are known at the compile time.
+    bool isPlanar = layerTexCoord.base.mappingType == UV_MAPPING_PLANAR;
+    bool isTriplanar = layerTexCoord.base.mappingType == UV_MAPPING_TRIPLANAR;
-#if defined(_PER_PIXEL_DISPLACEMENT) &&  defined(_HEIGHTMAP)
-    // All variable are compile time value
-    ppdEnable = true;
-    isPlanar = layerTexCoord.base.mappingType == UV_MAPPING_PLANAR;
-    isTriplanar = layerTexCoord.base.mappingType == UV_MAPPING_TRIPLANAR;
-#endif
+    // See comment in layered version for details
+    float  maxHeight = GetMaxDisplacement();
+    ApplyDisplacementTileScale(maxHeight);
+    float2 minUvSize = GetMinUvSize(layerTexCoord);
+    float  lod       = ComputeTextureLOD(minUvSize);
-    if (ppdEnable)
-    {
-        // See comment in layered version for details
-        float maxHeight = GetMaxDisplacement();
-        float2 minUvSize = GetMinUvSize(layerTexCoord);
-        float lod = ComputeTextureLOD(minUvSize);
+    // TODO: precompute uvSpaceScale
+    float2 invPrimScale = (isPlanar || isTriplanar) ? float2(1.0, 1.0) : _InvPrimScale.xy;
+    float  worldScale   = (isPlanar || isTriplanar) ? _TexWorldScale : 1.0;
+    float2 uvSpaceScale = invPrimScale * _BaseColorMap_ST.xy * (worldScale * maxHeight);
+    float2 scaleOffsetDetails = _DetailMap_ST.xy;
-        PerPixelHeightDisplacementParam ppdParam;
+    PerPixelHeightDisplacementParam ppdParam;
-        float height; // final height processed
-        float NdotV;
+    float height = 0; // final height processed
+    float NdotV  = 0;
-        // planar/triplanar
-        float2 uvXZ;
-        float2 uvXY;
-        float2 uvZY;
-        GetTriplanarCoordinate(V, uvXZ, uvXY, uvZY);
+    // planar/triplanar
+    float2 uvXZ;
+    float2 uvXY;
+    float2 uvZY;
+    GetTriplanarCoordinate(V, uvXZ, uvXY, uvZY);
-        // TODO: support object space planar/triplanar ?
+    // TODO: support object space planar/triplanar ?
-        // We need to calculate the texture space direction. It depends on the mapping.
-        if (isTriplanar)
-        {
-            float3 viewDirTS;
-            float planeHeight;
-            int numSteps;
+    // We need to calculate the texture space direction. It depends on the mapping.
+    if (isTriplanar)
+    {
+        float planeHeight;
-            // Perform a POM in each direction and modify appropriate texture coordinate
-            ppdParam.uv = layerTexCoord.base.uvZY;
-            viewDirTS = float3(V.x > 0.0 ? uvZY : -uvZY, V.x);
-            numSteps = (int)lerp(_PPDMaxSamples, _PPDMinSamples, viewDirTS.z);
-            float2 offsetZY = ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirTS, maxHeight, ppdParam, planeHeight);
+        // Perform a POM in each direction and modify appropriate texture coordinate
+        [branch] if (layerTexCoord.triplanarWeights.x >= 0.001)
+        {
+            ppdParam.uv      = layerTexCoord.base.uvZY;
+            float3 viewDirTS = float3(uvZY, abs(V.x));
+            float3 viewDirUV = normalize(float3(viewDirTS.xy * uvSpaceScale, viewDirTS.z)); // TODO: skip normalize
+            float  unitAngle = saturate(FastACosPos(viewDirUV.z) * INV_HALF_PI);            // TODO: optimize
+            int    numSteps  = (int)lerp(_PPDMinSamples, _PPDMaxSamples, unitAngle);
+            float2 offset    = ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirUV, ppdParam, planeHeight);
-            layerTexCoord.base.uvZY += offsetZY;
-            layerTexCoord.details.uvZY += offsetZY;
-            height = layerTexCoord.triplanarWeights.x * planeHeight;
+            layerTexCoord.base.uvZY    += offset;
+            layerTexCoord.details.uvZY += offset * scaleOffsetDetails;
+            height += layerTexCoord.triplanarWeights.x * planeHeight;
+            NdotV  += layerTexCoord.triplanarWeights.x * viewDirTS.z;
+        }
-            ppdParam.uv = layerTexCoord.base.uvXZ;
-            viewDirTS = float3(V.y > 0.0 ? uvXZ : -uvXZ, V.y);
-            numSteps = (int)lerp(_PPDMaxSamples, _PPDMinSamples, viewDirTS.z);
-            float2 offsetXZ = ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirTS, maxHeight, ppdParam, planeHeight);
+        [branch] if (layerTexCoord.triplanarWeights.y >= 0.001)
+        {
+            ppdParam.uv      = layerTexCoord.base.uvXZ;
+            float3 viewDirTS = float3(uvXZ, abs(V.y));
+            float3 viewDirUV = normalize(float3(viewDirTS.xy * uvSpaceScale, viewDirTS.z)); // TODO: skip normalize
+            float  unitAngle = saturate(FastACosPos(viewDirUV.z) * INV_HALF_PI);            // TODO: optimize
+            int    numSteps  = (int)lerp(_PPDMinSamples, _PPDMaxSamples, unitAngle);
+            float2 offset    = ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirUV, ppdParam, planeHeight);
-            layerTexCoord.base.uvXZ += offsetXZ;
-            layerTexCoord.details.uvXZ += offsetXZ;
+            layerTexCoord.base.uvXZ    += offset;
+            layerTexCoord.details.uvXZ += offset * scaleOffsetDetails;
+            NdotV  += layerTexCoord.triplanarWeights.y * viewDirTS.z;
+        }
-            ppdParam.uv = layerTexCoord.base.uvXY;
-            viewDirTS = float3(V.z > 0.0 ? uvXY : -uvXY, V.z);
-            numSteps = (int)lerp(_PPDMaxSamples, _PPDMinSamples, viewDirTS.z);
-            float2 offsetXY = ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirTS, maxHeight, ppdParam, planeHeight);
+        [branch] if (layerTexCoord.triplanarWeights.z >= 0.001)
+        {
+            ppdParam.uv      = layerTexCoord.base.uvXY;
+            float3 viewDirTS = float3(uvXY, abs(V.z));
+            float3 viewDirUV = normalize(float3(viewDirTS.xy * uvSpaceScale, viewDirTS.z)); // TODO: skip normalize
+            float  unitAngle = saturate(FastACosPos(viewDirUV.z) * INV_HALF_PI);            // TODO: optimize
+            int    numSteps  = (int)lerp(_PPDMinSamples, _PPDMaxSamples, unitAngle);
+            float2 offset    = ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirUV, ppdParam, planeHeight);
-            layerTexCoord.base.uvXY += offsetXY;
-            layerTexCoord.details.uvXY += offsetXY;
+            layerTexCoord.base.uvXY    += offset;
+            layerTexCoord.details.uvXY += offset * scaleOffsetDetails;
-
-            NdotV = 1; // TODO.
+            NdotV  += layerTexCoord.triplanarWeights.z * viewDirTS.z;
-        else
-        {
-            ppdParam.uv = layerTexCoord.base.uv; // For planar it is uv too, not uvXZ
-
-            float3x3 worldToTangent = input.worldToTangent;
-
-            // Note: The TBN is not normalize as it is based on mikkt. We should normalize it, but POM is always use on simple enough surfarce that mean it is not required (save 2 normalize). Tag: SURFACE_GRADIENT
-            float3 viewDirTS = isPlanar ? float3(uvXZ, V.y) : TransformWorldToTangent(V, worldToTangent);
+    }
+    else
+    {
+        ppdParam.uv = layerTexCoord.base.uv; // For planar it is uv too, not uvXZ
-            NdotV = viewDirTS.z;
-
-            int numSteps = (int)lerp(_PPDMaxSamples, _PPDMinSamples, viewDirTS.z);
-
-            float2 offset = ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirTS, maxHeight, ppdParam, height);
+        // Note: The TBN is not normalize as it is based on mikkt. We should normalize it, but POM is always use on simple enough surfarce that mean it is not required (save 2 normalize). Tag: SURFACE_GRADIENT
+        float3 viewDirTS = isPlanar ? float3(uvXZ, V.y) : TransformWorldToTangent(V, input.worldToTangent) * GetDisplacementObjectScale(false).xzy; // Switch from Y-up to Z-up (as we move to tangent space)
+        NdotV = viewDirTS.z;
-            // Apply offset to all UVSet0 / planar
-            layerTexCoord.base.uv += offset;
-            layerTexCoord.details.uv += isPlanar ? offset : _UVDetailsMappingMask.x * offset; // Only apply offset if details map use UVSet0 _UVDetailsMappingMask.x will be 1 in this case, else 0
-        }
+        // Transform the view vector into the UV space.
+        float3 viewDirUV    = normalize(float3(viewDirTS.xy * uvSpaceScale, viewDirTS.z)); // TODO: skip normalize
+        float  unitAngle    = saturate(FastACosPos(viewDirUV.z) * INV_HALF_PI);            // TODO: optimize
+        int    numSteps     = (int)lerp(_PPDMinSamples, _PPDMaxSamples, unitAngle);
+        float2 offset       = ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirUV, ppdParam, height);
-        // Since POM "pushes" geometry inwards (rather than extrude it), { height = height - 1 }.
-        // Since the result is used as a 'depthOffsetVS', it needs to be positive, so we flip the sign.
-        float verticalDisplacement = maxHeight - height * maxHeight;
-        // IDEA: precompute the tiling scale? MOV-MUL vs MOV-MOV-MAX-RCP-MUL.
-        float tilingScale = rcp(max(_BaseColorMap_ST.x, _BaseColorMap_ST.y));
-        return tilingScale * verticalDisplacement / NdotV;
+        // Apply offset to all UVSet0 / planar
+        layerTexCoord.base.uv += offset;
+        // Note: Applying offset on detail uv is only correct if it use the same UVSet or is planar or triplanar. It is up to the user to do the correct thing.
+        layerTexCoord.details.uv += offset * scaleOffsetDetails;
+    // Since POM "pushes" geometry inwards (rather than extrude it), { height = height - 1 }.
+    // Since the result is used as a 'depthOffsetVS', it needs to be positive, so we flip the sign.
+    float verticalDisplacement = maxHeight - height * maxHeight;
+    return verticalDisplacement / max(NdotV, 0.001);
+#else
+#endif
-float ComputePerVertexDisplacement(LayerTexCoord layerTexCoord, float4 vertexColor, float lod)
+float3 ComputePerVertexDisplacement(LayerTexCoord layerTexCoord, float4 vertexColor, float lod)
-    #ifdef _VERTEX_DISPLACEMENT_TILING_SCALE
-    // When we change the tiling, we have want to conserve the ratio with the displacement (and this is consistent with per pixel displacement)
-    // IDEA: precompute the tiling scale? MOV-MUL vs MOV-MOV-MAX-RCP-MUL.
-    float tilingScale = rcp(max(_BaseColorMap_ST.x, _BaseColorMap_ST.y));
-    height *= tilingScale;
-    #endif
-    return height;
+
+    // Height is affected by tiling property and by object scale (depends on option).
+    // Apply scaling from tiling properties (TexWorldScale and tiling from BaseColor)
+    ApplyDisplacementTileScale(height);
+    // Applying scaling of the object if requested
+#ifdef _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE
+    float3 objectScale = GetDisplacementObjectScale(true);
+    // Reminder: mappingType is know statically, so code below is optimize by the compiler
+    // Planar and Triplanar are in world space thus it is independent of object scale
+    return height.xxx * ((layerTexCoord.base.mappingType == UV_MAPPING_UVSET) ? objectScale : float3(1.0, 1.0, 1.0));
+#else
+    return height.xxx;
+#endif
 }
 
 void GetSurfaceAndBuiltinData(FragInputs input, float3 V, inout PositionInputs posInput, out SurfaceData surfaceData, out BuiltinData builtinData)
     ApplyDepthOffsetPositionInput(V, depthOffset, GetWorldToHClipMatrix(), posInput);
 #endif
 
-    float3 interpolatedVertexNormal = input.worldToTangent[2].xyz;
-
     // We perform the conversion to world of the normalTS outside of the GetSurfaceData
     // so it allow us to correctly deal with detail normal map and optimize the code for the layered shaders
     float3 normalTS;
     GetBuiltinData(input, surfaceData, alpha, bentNormalWS, depthOffset, builtinData);
 }
 
-#else
+#else // if LAYERED_LIT_SHADER
+
+#define LAYERS_HEIGHTMAP_ENABLE (defined(_HEIGHTMAP0) || defined(_HEIGHTMAP1) || (_LAYER_COUNT > 2 && defined(_HEIGHTMAP2)) || (_LAYER_COUNT > 3 && defined(_HEIGHTMAP3)))
 
 // Number of sampler are limited, we need to share sampler as much as possible with lit material
 // for this we put the constraint that the sampler are the same in a layered material for all textures of the same type
 #endif
 
 // Define a helper macro
-
 
 #define ADD_ZERO_IDX(Name) Name##0
 
     // Note: Blend mask have its dedicated mapping and tiling.
     // To share code, we simply call the regular code from the main layer for it then save the result, then do regular call for all layers.
     ComputeLayerTexCoord0(  texCoord0, texCoord1, texCoord2, texCoord3, _UVMappingMaskBlendMask, _UVMappingMaskBlendMask,
-                            _LayerMaskMap_ST.xy, _LayerMaskMap_ST.zw, float2(0.0, 0.0), float2(0.0, 0.0), 1.0,
+                            _LayerMaskMap_ST.xy, _LayerMaskMap_ST.zw, float2(0.0, 0.0), float2(0.0, 0.0), 1.0, false,
                             positionWS, _TexWorldScaleBlendMask,
                             mappingType, layerTexCoord);
 
                             #if !defined(_MAIN_LAYER_INFLUENCE_MODE)
                             * tileObjectScale  // We only affect layer0 in case we are not in influence mode (i.e we should not change the base object)
                             #endif
+                            , _LinkDetailsWithBase0
                             , positionWS, _TexWorldScale0,
                             mappingType, layerTexCoord);
 
     mappingType = UV_MAPPING_TRIPLANAR;
 #endif
     ComputeLayerTexCoord1(  texCoord0, texCoord1, texCoord2, texCoord3, _UVMappingMask1, _UVDetailsMappingMask1,
-                            _BaseColorMap1_ST.xy, _BaseColorMap1_ST.zw, _DetailMap1_ST.xy, _DetailMap1_ST.zw, tileObjectScale,
+                            _BaseColorMap1_ST.xy, _BaseColorMap1_ST.zw, _DetailMap1_ST.xy, _DetailMap1_ST.zw, tileObjectScale, _LinkDetailsWithBase1,
                             positionWS, _TexWorldScale1,
                             mappingType, layerTexCoord);
 
     mappingType = UV_MAPPING_TRIPLANAR;
 #endif
     ComputeLayerTexCoord2(  texCoord0, texCoord1, texCoord2, texCoord3, _UVMappingMask2, _UVDetailsMappingMask2,
-                            _BaseColorMap2_ST.xy, _BaseColorMap2_ST.zw, _DetailMap2_ST.xy, _DetailMap2_ST.zw, tileObjectScale,
+                            _BaseColorMap2_ST.xy, _BaseColorMap2_ST.zw, _DetailMap2_ST.xy, _DetailMap2_ST.zw, tileObjectScale, _LinkDetailsWithBase2,
                             positionWS, _TexWorldScale2,
                             mappingType, layerTexCoord);
 
     mappingType = UV_MAPPING_TRIPLANAR;
 #endif
     ComputeLayerTexCoord3(  texCoord0, texCoord1, texCoord2, texCoord3, _UVMappingMask3, _UVDetailsMappingMask3,
-                            _BaseColorMap3_ST.xy, _BaseColorMap3_ST.zw, _DetailMap3_ST.xy, _DetailMap3_ST.zw, tileObjectScale,
+                            _BaseColorMap3_ST.xy, _BaseColorMap3_ST.zw, _DetailMap3_ST.xy, _DetailMap3_ST.zw, tileObjectScale, _LinkDetailsWithBase3,
                             positionWS, _TexWorldScale3,
                             mappingType, layerTexCoord);
 }
 void ApplyDisplacementTileScale(inout float height0, inout float height1, inout float height2, inout float height3)
 {
     // When we change the tiling, we have want to conserve the ratio with the displacement (and this is consistent with per pixel displacement)
-#ifdef _VERTEX_DISPLACEMENT_TILING_SCALE
+#ifdef _DISPLACEMENT_LOCK_TILING_SCALE
     float tileObjectScale = 1.0;
     #ifdef _LAYER_TILING_COUPLED_WITH_UNIFORM_OBJECT_SCALE
     // Extract scaling from world transform
     #endif
 
-    height0 /= max(_BaseColorMap0_ST.x, _BaseColorMap0_ST.y);
+    // TODO: precompute all these scaling factors!
+    height0 *= _InvTilingScale0;
-    height0 *= tileObjectScale;  // We only affect layer0 in case we are not in influence mode (i.e we should not change the base object)
+    height0 /= tileObjectScale;  // We only affect layer0 in case we are not in influence mode (i.e we should not change the base object)
-    height1 /= tileObjectScale * max(_BaseColorMap1_ST.x, _BaseColorMap1_ST.y);
-    height2 /= tileObjectScale * max(_BaseColorMap2_ST.x, _BaseColorMap2_ST.y);
-    height3 /= tileObjectScale * max(_BaseColorMap3_ST.x, _BaseColorMap3_ST.y);
+    height1 = (height1 / tileObjectScale) * _InvTilingScale1;
+    height2 = (height2 / tileObjectScale) * _InvTilingScale2;
+    height3 = (height3 / tileObjectScale) * _InvTilingScale3;
 #endif
 }
 
 
 float GetInfluenceMask(LayerTexCoord layerTexCoord, bool useLodSampling = false, float lod = 0)
 {
-    return useLodSampling ? SAMPLE_UVMAPPING_TEXTURE2D_LOD(_LayerInfluenceMaskMap, sampler_LayerMaskMap, layerTexCoord.blendMask, lod).r : SAMPLE_UVMAPPING_TEXTURE2D(_LayerInfluenceMaskMap, sampler_LayerMaskMap, layerTexCoord.blendMask).r;
+    // Sample influence mask with same mapping as Main layer
+    return useLodSampling ? SAMPLE_UVMAPPING_TEXTURE2D_LOD(_LayerInfluenceMaskMap, sampler_LayerInfluenceMaskMap, layerTexCoord.base0, lod).r : SAMPLE_UVMAPPING_TEXTURE2D(_LayerInfluenceMaskMap, sampler_LayerInfluenceMaskMap, layerTexCoord.base0).r;
+}
+
+float GetMaxHeight(float4 heights)
+{
+    float maxHeight = max(heights.r, heights.g);
+#ifdef _LAYEREDLIT_4_LAYERS
+    maxHeight = max(Max3(heights.r, heights.g, heights.b), heights.a);
+#endif
+#ifdef _LAYEREDLIT_3_LAYERS
+    maxHeight = Max3(heights.r, heights.g, heights.b);
+#endif
+
+    return maxHeight;
+}
+
+// Returns layering blend mask after application of height based blend.
+float4 ApplyHeightBlend(float4 heights, float4 blendMask)
+{
+    // Add offsets for all the layers.
+    heights = heights + float4(_HeightOffset0, _HeightOffset1, _HeightOffset2, _HeightOffset3);
+
+    // We need to mask out inactive layers so that their height does not impact the result.
+    float4 maskedHeights = heights * blendMask.argb;
+
+    float maxHeight = GetMaxHeight(maskedHeights);
+    // Make sure that transition is not zero otherwise the next computation will be wrong.
+    // The epsilon here also has to be bigger than the epsilon in the next computation.
+    float transition = max(_HeightTransition, 1e-5);
+
+    // The goal here is to have all but the highest layer at negative heights, then we add the transition so that if the next highest layer is near transition it will have a positive value.
+    // Then we clamp this to zero and normalize everything so that highest layer has a value of 1.
+    maskedHeights = maskedHeights - maxHeight.xxxx;
+    // We need to add an epsilon here for active layers (hence the blendMask again) so that at least a layer shows up if everything's too low.
+    maskedHeights = (max(0, maskedHeights + transition) + 1e-6) * blendMask.argb;
+
+    // Normalize
+    maxHeight = GetMaxHeight(maskedHeights);
+    maskedHeights = maskedHeights / maxHeight.xxxx;
+
+    return maskedHeights.yzwx;
 }
 
 // Return the maximun amplitude use by all enabled heightmap
     return minUvSize;
 }
 
+#if defined(_PIXEL_DISPLACEMENT) && LAYERS_HEIGHTMAP_ENABLE
-    float weights[_MAX_LAYER];
+    float4 blendMasks;
-    float mainHeightInfluence;
+    float2 uvSpaceScale[_MAX_LAYER];
+#if defined(_MAIN_LAYER_INFLUENCE_MODE) && defined(_HEIGHTMAP0)
+    float heightInfluence[_MAX_LAYER];
+#endif
-#if defined(_HEIGHTMAP0) || defined(_HEIGHTMAP1) || defined(_HEIGHTMAP2) || defined(_HEIGHTMAP3)
-    // Note: No multiply by amplitude here, this is bake into the weights and apply in BlendLayeredScalar
-    // The amplitude is normalize to be able to work with POM algorithm
-    // Tiling is automatically handled correctly here as we use 4 differents uv even if they come from the same UVSet (they include the tiling)
-    float height0 = SAMPLE_TEXTURE2D_LOD(_HeightMap0, SAMPLER_HEIGHTMAP_IDX, param.uv[0] + texOffsetCurrent, lod).r;
-    float height1 = SAMPLE_TEXTURE2D_LOD(_HeightMap1, SAMPLER_HEIGHTMAP_IDX, param.uv[1] + texOffsetCurrent, lod).r;
-    float height2 = SAMPLE_TEXTURE2D_LOD(_HeightMap2, SAMPLER_HEIGHTMAP_IDX, param.uv[2] + texOffsetCurrent, lod).r;
-    float height3 = SAMPLE_TEXTURE2D_LOD(_HeightMap3, SAMPLER_HEIGHTMAP_IDX, param.uv[3] + texOffsetCurrent, lod).r;
-    SetEnabledHeightByLayer(height0, height1, height2, height3);  // Not needed as already put in weights but paranoid mode
-    return BlendLayeredScalar(height0, height1, height2, height3, param.weights) + height0 * param.mainHeightInfluence;
-#else
-    return 0.0;
+    // See function ComputePerVertexDisplacement() for comment about the weights/influenceMask/BlendMask
+
+    // Note: Amplitude is handled in uvSpaceScale, no need to multiply by it here.
+    float height0 = SAMPLE_TEXTURE2D_LOD(_HeightMap0, SAMPLER_HEIGHTMAP_IDX, param.uv[0] + texOffsetCurrent * param.uvSpaceScale[0], lod).r;
+    float height1 = SAMPLE_TEXTURE2D_LOD(_HeightMap1, SAMPLER_HEIGHTMAP_IDX, param.uv[1] + texOffsetCurrent * param.uvSpaceScale[1], lod).r;
+    float height2 = SAMPLE_TEXTURE2D_LOD(_HeightMap2, SAMPLER_HEIGHTMAP_IDX, param.uv[2] + texOffsetCurrent * param.uvSpaceScale[2], lod).r;
+    float height3 = SAMPLE_TEXTURE2D_LOD(_HeightMap3, SAMPLER_HEIGHTMAP_IDX, param.uv[3] + texOffsetCurrent * param.uvSpaceScale[3], lod).r;
+
+    SetEnabledHeightByLayer(height0, height1, height2, height3);
+
+    float4 blendMasks = param.blendMasks;
+#if defined(_HEIGHT_BASED_BLEND)
+    // Modify blendMask to take into account the height of the layer. Higher height should be more visible.
+    blendMasks = ApplyHeightBlend(float4(height0, height1, height2, height3), param.blendMasks);
+
+    float weights[_MAX_LAYER];
+    ComputeMaskWeights(blendMasks, weights);
+
+#if defined(_MAIN_LAYER_INFLUENCE_MODE) && defined(_HEIGHTMAP0)
+    float influenceMask = blendMasks.a;
+    #ifdef _INFLUENCEMASK_MAP
+    influenceMask *= SAMPLE_TEXTURE2D_LOD(_LayerInfluenceMaskMap, sampler_BaseColorMap0, param.uv[0], lod).r;
+    #endif
+    height1 += height0 * _InheritBaseHeight1 * influenceMask;
+    height2 += height0 * _InheritBaseHeight2 * influenceMask;
+    height3 += height0 * _InheritBaseHeight3 * influenceMask;
+#endif
+
+    return BlendLayeredScalar(height0, height1, height2, height3, weights);
+
+#endif // defined(_PIXEL_DISPLACEMENT) && LAYERS_HEIGHTMAP_ENABLE
 
 // PPD is affecting only one mapping at the same time, mean we need to execute it for each mapping (UV0, UV1, 3 times for triplanar etc..)
 // We chose to not support all this case that are extremely hard to manage (for example mixing different mapping, mean it also require different tangent space that is not supported in Unity)
 // - Blend Mask use same mapping as main layer (UVO, Planar, Triplanar)
 // From these rules it mean that PPD is enable only if the user 1) ask for it, 2) if there is one heightmap enabled on active layer, 3) if mapping is the same for all layer respecting 2), 4) if mapping is UV0, planar or triplanar mapping
 // Most contraint are handled by the inspector (i.e the UI) like the mapping constraint and is assumed in the shader.
-float ApplyPerPixelDisplacement(FragInputs input, float3 V, inout LayerTexCoord layerTexCoord, float influenceMask)
+float ApplyPerPixelDisplacement(FragInputs input, float3 V, inout LayerTexCoord layerTexCoord, float4 blendMasks)
-    bool ppdEnable = false;
+#if defined(_PIXEL_DISPLACEMENT) && LAYERS_HEIGHTMAP_ENABLE
-#ifdef _PER_PIXEL_DISPLACEMENT
-
-    ppdEnable = true;
-    ppdEnable = true;
     isPlanar = layerTexCoord.base1.mappingType == UV_MAPPING_PLANAR;
     isTriplanar = layerTexCoord.base1.mappingType == UV_MAPPING_TRIPLANAR;
 #endif
-    ppdEnable = true;
     isPlanar = layerTexCoord.base2.mappingType == UV_MAPPING_PLANAR;
     isTriplanar = layerTexCoord.base2.mappingType == UV_MAPPING_TRIPLANAR;
 #endif
 #if defined(_HEIGHTMAP3)
-    ppdEnable = true;
-#endif // _PER_PIXEL_DISPLACEMENT
+    // Compute lod as we will sample inside a loop(so can't use regular sampling)
+    // Note: It appear that CALCULATE_TEXTURE2D_LOD only return interger lod. We want to use float lod to have smoother transition and fading, so do our own calculation.
+    // Approximation of lod to used. Be conservative here, we will take the highest mip of all layers.
+    // Remember, we assume that we used the same mapping for all layer, so only size matter.
+    float2 minUvSize = GetMinUvSize(layerTexCoord);
+    float lod = ComputeTextureLOD(minUvSize);
-    if (ppdEnable)
-    {
-        // Even if we use same mapping we can have different tiling. For per pixel displacement we will perform the ray marching with already tiled uv
-        float maxHeight = GetMaxDisplacement();
-        // Compute lod as we will sample inside a loop(so can't use regular sampling)
-        // Note: It appear that CALCULATE_TEXTURE2D_LOD only return interger lod. We want to use float lod to have smoother transition and fading, so do our own calculation.
-        // Approximation of lod to used. Be conservative here, we will take the highest mip of all layers.
-        // Remember, we assume that we used the same mapping for all layer, so only size matter.
-        float2 minUvSize = GetMinUvSize(layerTexCoord);
-        float lod = ComputeTextureLOD(minUvSize);
+    // TODO: Here we calculate the scale transform from world to UV space , which is what we have done in GetLayerTexCoord but without the texBias.
+    // Mean we must also apply the same "additionalTiling", currently not apply Also precompute all this!
+    float  maxHeight0 = abs(_HeightAmplitude0);
+    float  maxHeight1 = abs(_HeightAmplitude1);
+    float  maxHeight2 = abs(_HeightAmplitude2);
+    float  maxHeight3 = abs(_HeightAmplitude3);
-        // Calculate blend weights
-        float4 blendMasks = GetBlendMask(layerTexCoord, input.color);
-
-        float weights[_MAX_LAYER];
-        ComputeMaskWeights(blendMasks, weights);
-
-        // Be sure we are not considering weight here were there is no heightmap
-        SetEnabledHeightByLayer(weights[0], weights[1], weights[2], weights[3]);
-
-        PerPixelHeightDisplacementParam ppdParam;
-#if defined(_MAIN_LAYER_INFLUENCE_MODE)
-        // For per pixel displacement we need to have normalized height scale to calculate the interesection (required by the algorithm we use)
-        // mean that we will normalize by the highest amplitude.
-        // We store this normalization factor with the weights as it will be multiply by the readed height.
-        ppdParam.weights[0] = weights[0] * (_HeightAmplitude0) / maxHeight;
-        ppdParam.weights[1] = weights[1] * (_HeightAmplitude1 + _HeightAmplitude0 * _InheritBaseHeight1) / maxHeight;
-        ppdParam.weights[2] = weights[2] * (_HeightAmplitude2 + _HeightAmplitude0 * _InheritBaseHeight2) / maxHeight;
-        ppdParam.weights[3] = weights[3] * (_HeightAmplitude3 + _HeightAmplitude0 * _InheritBaseHeight3) / maxHeight;
-
-        // Think that inheritbasedheight will be 0 if height0 is fully visible in weights. So there is no double contribution of height0
-        float mainHeightInfluence = BlendLayeredScalar(0.0, _InheritBaseHeight1, _InheritBaseHeight2, _InheritBaseHeight3, weights) * influenceMask;
-        ppdParam.mainHeightInfluence = mainHeightInfluence;
-#else
-        [unroll]
-        for (int i = 0; i < _MAX_LAYER; ++i)
-        {
-            ppdParam.weights[i] = weights[i];
-        }
-        ppdParam.mainHeightInfluence = 0.0;
+    ApplyDisplacementTileScale(maxHeight0, maxHeight1, maxHeight2, maxHeight3);
+#if defined(_MAIN_LAYER_INFLUENCE_MODE) && defined(_HEIGHTMAP0)
+    maxHeight1 += abs(_HeightAmplitude0) * _InheritBaseHeight1;
+    maxHeight2 += abs(_HeightAmplitude0) * _InheritBaseHeight2;
+    maxHeight3 += abs(_HeightAmplitude0) * _InheritBaseHeight3;
-        float height; // final height processed
-        float NdotV;
-
-        // planar/triplanar
-        float2 uvXZ;
-        float2 uvXY;
-        float2 uvZY;
-        GetTriplanarCoordinate(V, uvXZ, uvXY, uvZY);
-
-        // We need to calculate the texture space direction. It depends on the mapping.
-        if (isTriplanar)
-        {
-            // TODO: implement. Require 3 call to POM + dedicated viewDirTS based on triplanar convention
-            // apply the 3 offset on all layers
-            /*
+    float weights[_MAX_LAYER];
+    ComputeMaskWeights(blendMasks, weights);
+    float maxHeight = BlendLayeredScalar(maxHeight0, maxHeight1, maxHeight2, maxHeight3, weights);
-            ppdParam.uv[0] = layerTexCoord.base0.uvZY;
-            ppdParam.uv[1] = layerTexCoord.base1.uvYZ;
-            ppdParam.uv[2] = layerTexCoord.base2.uvYZ;
-            ppdParam.uv[3] = layerTexCoord.base3.uvYZ;
+    float2 worldScale0 = (isPlanar || isTriplanar) ? _TexWorldScale0.xx : _InvPrimScale.xy;
+    float2 worldScale1 = (isPlanar || isTriplanar) ? _TexWorldScale1.xx : _InvPrimScale.xy;
+    float2 worldScale2 = (isPlanar || isTriplanar) ? _TexWorldScale2.xx : _InvPrimScale.xy;
+    float2 worldScale3 = (isPlanar || isTriplanar) ? _TexWorldScale3.xx : _InvPrimScale.xy;
-            float3 viewDirTS = ;
-            int numSteps = (int)lerp(_PPDMaxSamples, _PPDMinSamples, abs(viewDirTS.z));
-            ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirTS, maxHeight, ppdParam);
+    PerPixelHeightDisplacementParam ppdParam;
+    ppdParam.blendMasks = blendMasks;
+    ppdParam.uvSpaceScale[0] = _BaseColorMap0_ST.xy * worldScale0;// *maxHeight0;
+    ppdParam.uvSpaceScale[1] = _BaseColorMap1_ST.xy * worldScale1;// *maxHeight1;
+    ppdParam.uvSpaceScale[2] = _BaseColorMap2_ST.xy * worldScale2;// *maxHeight2;
+    ppdParam.uvSpaceScale[3] = _BaseColorMap3_ST.xy * worldScale3;// *maxHeight3;
-            // Apply to all uvZY
+    float uvSpaceScale = BlendLayeredScalar(ppdParam.uvSpaceScale[0], ppdParam.uvSpaceScale[1], ppdParam.uvSpaceScale[2], ppdParam.uvSpaceScale[3], weights);
-            // Repeat for uvXZ
+    float2 scaleOffsetDetails0 =_DetailMap0_ST.xy;
+    float2 scaleOffsetDetails1 =_DetailMap1_ST.xy;
+    float2 scaleOffsetDetails2 =_DetailMap2_ST.xy;
+    float2 scaleOffsetDetails3 =_DetailMap3_ST.xy;
-            // Repeat for uvXY
+    float height; // final height processed
+    float NdotV;
-            // Apply to all layer that used triplanar
-            */
-            height = 1;
-            NdotV  = 1;
-        }
-        else
-        {
-            ppdParam.uv[0] = layerTexCoord.base0.uv;
-            ppdParam.uv[1] = layerTexCoord.base1.uv;
-            ppdParam.uv[2] = layerTexCoord.base2.uv;
-            ppdParam.uv[3] = layerTexCoord.base3.uv;
+    // planar/triplanar
+    float2 uvXZ;
+    float2 uvXY;
+    float2 uvZY;
+    GetTriplanarCoordinate(V, uvXZ, uvXY, uvZY);
-            float3x3 worldToTangent = input.worldToTangent;
-
-            // Note: The TBN is not normalize as it is based on mikkt. We should normalize it, but POM is always use on simple enough surfarce that mean it is not required (save 2 normalize). Tag: SURFACE_GRADIENT
-            // For planar the view vector is the world view vector (unless we want to support object triplanar ? and in this case used TransformWorldToObject)
-            // TODO: do we support object triplanar ? See ComputeLayerTexCoord
-            float3 viewDirTS = isPlanar ? float3(uvXZ, V.y) : TransformWorldToTangent(V, worldToTangent);
-            NdotV = viewDirTS.z;
-
-            int numSteps = (int)lerp(_PPDMaxSamples, _PPDMinSamples, viewDirTS.z);
-
-            float2 offset = ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirTS, maxHeight, ppdParam, height);
-
-            // Apply offset to all planar UV if applicable
-            float4 planarWeight = float4(   layerTexCoord.base0.mappingType == UV_MAPPING_PLANAR ? 1.0 : 0.0,
-                                            layerTexCoord.base1.mappingType == UV_MAPPING_PLANAR ? 1.0 : 0.0,
-                                            layerTexCoord.base2.mappingType == UV_MAPPING_PLANAR ? 1.0 : 0.0,
-                                            layerTexCoord.base3.mappingType == UV_MAPPING_PLANAR ? 1.0 : 0.0);
-
-            // _UVMappingMask0.x will be 1.0 is UVSet0 is used;
-            float4 offsetWeights = isPlanar ? planarWeight : float4(_UVMappingMask0.x, _UVMappingMask1.x, _UVMappingMask2.x, _UVMappingMask3.x);
-
-            layerTexCoord.base0.uv += offsetWeights.x * offset;
-            layerTexCoord.base1.uv += offsetWeights.y * offset;
-            layerTexCoord.base2.uv += offsetWeights.z * offset;
-            layerTexCoord.base3.uv += offsetWeights.w * offset;
-
-            offsetWeights = isPlanar ? planarWeight : float4(_UVDetailsMappingMask0.x, _UVDetailsMappingMask1.x, _UVDetailsMappingMask2.x, _UVDetailsMappingMask3.x);
-
-            layerTexCoord.details0.uv += offsetWeights.x * offset;
-            layerTexCoord.details1.uv += offsetWeights.y * offset;
-            layerTexCoord.details2.uv += offsetWeights.z * offset;
-            layerTexCoord.details3.uv += offsetWeights.w * offset;
-        }
-
-        // Since POM "pushes" geometry inwards (rather than extrude it), { height = height - 1 }.
-        // Since the result is used as a 'depthOffsetVS', it needs to be positive, so we flip the sign.
-        float verticalDisplacement = maxHeight - height * maxHeight;
-        // IDEA: precompute the tiling scale? MOV-MUL vs MOV-MOV-MAX-RCP-MUL.
-        float tilingScale = rcp(max(_BaseColorMap0_ST.x, _BaseColorMap0_ST.y));
-        return tilingScale * verticalDisplacement / max(NdotV, 0.001);
+    // We need to calculate the texture space direction. It depends on the mapping.
+    if (isTriplanar)
+    {
+        // This is not supported currently
+        height = 1.0;
+        NdotV  = 1.0;
+    else
+    {
+        // For planar it is uv too, not uvXZ
+        ppdParam.uv[0] = layerTexCoord.base0.uv;
+        ppdParam.uv[1] = layerTexCoord.base1.uv;
+        ppdParam.uv[2] = layerTexCoord.base2.uv;
+        ppdParam.uv[3] = layerTexCoord.base3.uv;
-    return 0.0;
-}
+        // Note: The TBN is not normalize as it is based on mikkt. We should normalize it, but POM is always use on simple enough surface that mean it is not required (save 2 normalize). Tag: SURFACE_GRADIENT
+        // Note: worldToTangent is only define for UVSet0, so we expect that layer that use POM have UVSet0
+        float3 viewDirTS = isPlanar ? float3(uvXZ, V.y) : TransformWorldToTangent(V, input.worldToTangent) * GetDisplacementObjectScale(false).xzy; // Switch from Y-up to Z-up (as we move to tangent space)
+        NdotV = viewDirTS.z;
-float GetMaxHeight(float4 heights)
-{
-    float maxHeight = max(heights.r, heights.g);
-    #ifdef _LAYEREDLIT_4_LAYERS
-        maxHeight = max(Max3(heights.r, heights.g, heights.b), heights.a);
-    #endif
-    #ifdef _LAYEREDLIT_3_LAYERS
-        maxHeight = Max3(heights.r, heights.g, heights.b);
-    #endif
+        // Transform the view vector into the UV space.
+        float3 viewDirUV = normalize(float3(viewDirTS.xy * maxHeight, viewDirTS.z));
+        float  unitAngle = saturate(FastACosPos(viewDirUV.z) * INV_HALF_PI);            // TODO: optimize
+        int    numSteps = (int)lerp(_PPDMinSamples, _PPDMaxSamples, unitAngle);
+        float2 offset = ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirUV, ppdParam, height);
+        offset *= uvSpaceScale;
-    return maxHeight;
-}
+        layerTexCoord.base0.uv += offset;
+        layerTexCoord.base1.uv += offset;
+        layerTexCoord.base2.uv += offset;
+        layerTexCoord.base3.uv += offset;
-// Returns layering blend mask after application of height based blend.
-float4 ApplyHeightBlend(float4 heights, float4 blendMask)
-{
-    // Add offsets for all the layers.
-    heights = heights + float4(_HeightOffset0, _HeightOffset1, _HeightOffset2, _HeightOffset3);
+        layerTexCoord.details0.uv += offset * scaleOffsetDetails0;
+        layerTexCoord.details1.uv += offset * scaleOffsetDetails1;
+        layerTexCoord.details2.uv += offset * scaleOffsetDetails2;
+        layerTexCoord.details3.uv += offset * scaleOffsetDetails3;
+    }
-    // We need to mask out inactive layers so that their height does not impact the result.
-    float4 maskedHeights = heights * blendMask.argb;
+    // Since POM "pushes" geometry inwards (rather than extrude it), { height = height - 1 }.
+    // Since the result is used as a 'depthOffsetVS', it needs to be positive, so we flip the sign. { height = -height + 1 }.
-    float maxHeight = GetMaxHeight(maskedHeights);
-    // Make sure that transition is not zero otherwise the next computation will be wrong.
-    // The epsilon here also has to be bigger than the epsilon in the next computation.
-    float transition = max(_HeightTransition, 1e-5);
-
-    // The goal here is to have all but the highest layer at negative heights, then we add the transition so that if the next highest layer is near transition it will have a positive value.
-    // Then we clamp this to zero and normalize everything so that highest layer has a value of 1.
-    maskedHeights = maskedHeights - maxHeight.xxxx;
-    // We need to add an epsilon here for active layers (hence the blendMask again) so that at least a layer shows up if everything's too low.
-    maskedHeights = (max(0, maskedHeights + transition) + 1e-6) * blendMask.argb;
-
-    // Normalize
-    maxHeight = GetMaxHeight(maskedHeights);
-    maskedHeights = maskedHeights / maxHeight.xxxx;
-
-    return maskedHeights.yzwx;
+    float verticalDisplacement = maxHeight - height * maxHeight;
+    return verticalDisplacement / max(NdotV, 0.001);
+#else
+    return 0.0;
+#endif
-float ComputePerVertexDisplacement(LayerTexCoord layerTexCoord, float4 vertexColor, float lod)
+float3 ComputePerVertexDisplacement(LayerTexCoord layerTexCoord, float4 vertexColor, float lod)
-#if defined(_HEIGHTMAP0) || defined(_HEIGHTMAP1) || defined(_HEIGHTMAP2) || defined(_HEIGHTMAP3)
+#if LAYERS_HEIGHTMAP_ENABLE
-    ApplyDisplacementTileScale(height0, height1, height2, height3); // Only apply with per vertex displacement
+    // Height is affected by tiling property and by object scale (depends on option).
+    // Apply scaling from tiling properties (TexWorldScale and tiling from BaseColor)
+    ApplyDisplacementTileScale(height0, height1, height2, height3);
+    // Nullify height that are not used, so compiler can remove unused case
+    SetEnabledHeightByLayer(height0, height1, height2, height3);
-    float4 blendMask = GetBlendMask(layerTexCoord, vertexColor, true, lod);
-    #if defined(_MAIN_LAYER_INFLUENCE_MODE)
+    float4 blendMasks = GetBlendMask(layerTexCoord, vertexColor, true, lod);
+
+    #if defined(_HEIGHT_BASED_BLEND)
+    // Modify blendMask to take into account the height of the layer. Higher height should be more visible.
+    blendMasks = ApplyHeightBlend(float4(height0, height1, height2, height3), blendMasks);
+    #endif
+
+    float weights[_MAX_LAYER];
+    ComputeMaskWeights(blendMasks, weights);
+
+    // _MAIN_LAYER_INFLUENCE_MODE is a pure visual mode that doesn't contribute to the weights of a layer
+    // The motivation is like this: if a layer is visible, then we will apply influence on top of it (so it is only visual).
+    // This is what is done for normal and baseColor and we do the same for height.
+    // Note that if we apply influence before ApplyHeightBlend, then have a different behavior.
+#if defined(_MAIN_LAYER_INFLUENCE_MODE) && defined(_HEIGHTMAP0)
-    float influenceMask = blendMask.a * GetInfluenceMask(layerTexCoord, true, lod);
+    float influenceMask = blendMasks.a;
+    #ifdef _INFLUENCEMASK_MAP
+    influenceMask *= GetInfluenceMask(layerTexCoord, true, lod);
+    #endif
-    #endif
+#endif
-    SetEnabledHeightByLayer(height0, height1, height2, height3);
+    float heightResult = BlendLayeredScalar(height0, height1, height2, height3, weights).xxx;
-    #if defined(_HEIGHT_BASED_BLEND)
-    blendMask = ApplyHeightBlend(float4(height0, height1, height2, height3), blendMask);
+   // Applying scaling of the object if requested
+    #ifdef _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE
+    float3 objectScale = GetDisplacementObjectScale(true);
+    // Reminder: mappingType is know statically, so code below is optimize by the compiler
+    // Planar and Triplanar are in world space thus it is independent of object scale
+    return heightResult.xxx * BlendLayeredVector3( ((layerTexCoord.base0.mappingType == UV_MAPPING_UVSET) ? objectScale : float3(1.0, 1.0, 1.0)),
+                                                   ((layerTexCoord.base1.mappingType == UV_MAPPING_UVSET) ? objectScale : float3(1.0, 1.0, 1.0)),
+                                                   ((layerTexCoord.base2.mappingType == UV_MAPPING_UVSET) ? objectScale : float3(1.0, 1.0, 1.0)),
+                                                   ((layerTexCoord.base3.mappingType == UV_MAPPING_UVSET) ? objectScale : float3(1.0, 1.0, 1.0)), weights);
+    #else
+    return heightResult.xxx;
-
-    float weights[_MAX_LAYER];
-    ComputeMaskWeights(blendMask, weights);
-    return BlendLayeredScalar(height0, height1, height2, height3, weights);
-    return 0.0;
+    return float3(0.0, 0.0, 0.0);
 #endif
 }
 
         outWeights[i] = 0.0f;
     }
 
-
 #if defined(_DENSITY_MODE)
     // Note: blendMasks.argb because a is main layer
     float4 opacityAsDensity = saturate((inputAlphaMask - (float4(1.0, 1.0, 1.0, 1.0) - blendMasks.argb)) * 20.0); // 20.0 is the number of steps in inputAlphaMask (Density mask. We decided 20 empirically)
 
-#if defined(_HEIGHT_BASED_BLEND)
-
-#if defined(_HEIGHTMAP0) || defined(_HEIGHTMAP1) || defined(_HEIGHTMAP2) || defined(_HEIGHTMAP3)
+#if LAYERS_HEIGHTMAP_ENABLE
+    // Height is affected by tiling property and by object scale (depends on option).
+    // Apply scaling from tiling properties (TexWorldScale and tiling from BaseColor)
+    ApplyDisplacementTileScale(height0, height1, height2, height3);
+    // Nullify height that are not used, so compiler can remove unused case
-    float4 heights = float4(height0, height1, height2, height3);
-    // HACK: use height0 to avoid compiler error for unused sampler - To remove when we can have a sampler without a textures
-    #if !defined(_PER_PIXEL_DISPLACEMENT)
-    // We don't use height 0 for the height blend based mode
-    heights.y += (heights.x * 0.0001);
+    // Reminder: _MAIN_LAYER_INFLUENCE_MODE is a purely visual mode, it is not take into account for the blendMasks
+    // As it is purely visual, it is not apply in ComputeLayerWeights
+
+    #if defined(_HEIGHT_BASED_BLEND)
+    // Modify blendMask to take into account the height of the layer. Higher height should be more visible.
+    blendMasks = ApplyHeightBlend(float4(height0, height1, height2, height3), blendMasks);
-
-    blendMasks = ApplyHeightBlend(heights, blendMasks);
-#endif
-    // If no heightmap is set on any layer, we don't need to try and blend them based on height...
 #endif
 
     ComputeMaskWeights(blendMasks, outWeights);
     ZERO_INITIALIZE(LayerTexCoord, layerTexCoord);
     GetLayerTexCoord(input, layerTexCoord);
 
-    float influenceMask = 0.0f;
-#if defined(_MAIN_LAYER_INFLUENCE_MODE)
-    influenceMask = GetInfluenceMask(layerTexCoord);
-#endif
-
-    float depthOffset = ApplyPerPixelDisplacement(input, V, layerTexCoord, influenceMask);
+    float4 blendMasks = GetBlendMask(layerTexCoord, input.color);
+    float depthOffset = ApplyPerPixelDisplacement(input, V, layerTexCoord, blendMasks);
 
 #ifdef _DEPTHOFFSET_ON
     ApplyDepthOffsetPositionInput(V, depthOffset, GetWorldToHClipMatrix(), posInput);
     float alpha3 = GetSurfaceData3(input, layerTexCoord, surfaceData3, normalTS3, bentNormalTS3);
 
     // Note: If per pixel displacement is enabled it mean we will fetch again the various heightmaps at the intersection location. Not sure the compiler can optimize.
-    float4 blendMasks = GetBlendMask(layerTexCoord, input.color);
     float weights[_MAX_LAYER];
     ComputeLayerWeights(input, layerTexCoord, float4(alpha0, alpha1, alpha2, alpha3), blendMasks, weights);
 
     float3 bentNormalTS;
     float3 bentNormalWS;
 #if defined(_MAIN_LAYER_INFLUENCE_MODE)
+
+    #ifdef _INFLUENCEMASK_MAP
+    float influenceMask = GetInfluenceMask(layerTexCoord);
+    #else
+    float influenceMask = 0.0;
+    #endif
+
     if (influenceMask > 0.0f)
     {
         surfaceData.baseColor = ComputeMainBaseColorInfluence(influenceMask, surfaceData0.baseColor, surfaceData1.baseColor, surfaceData2.baseColor, surfaceData3.baseColor, layerTexCoord, blendMasks.a, weights);

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitDataInternal.hlsl

-void ADD_IDX(ComputeLayerTexCoord)( // Uv related parameters
+void ADD_IDX(ComputeLayerTexCoord)( // Uv related parameters
-                                    float2 texScale, float2 texBias, float2 texScaleDetails, float2 texBiasDetails, float additionalTiling,
+                                    float2 texScale, float2 texBias, float2 texScaleDetails, float2 texBiasDetails, float additionalTiling, float linkDetailsWithBase,
                                     // parameter for planar/triplanar
                                     float3 positionWS, float worldScale,
                                     // mapping type and output
     // Apply tiling options
     ADD_IDX(layerTexCoord.base).uv = uvBase * texScale + texBias;
     // Detail map tiling option inherit from the tiling of the base
-    ADD_IDX(layerTexCoord.details).uv = (uvDetails * texScaleDetails + texBiasDetails) * texScale + texBias;
+    ADD_IDX(layerTexCoord.details).uv = uvDetails * texScaleDetails + texBiasDetails;
+    if (linkDetailsWithBase > 0.0)
+    {
+        ADD_IDX(layerTexCoord.details).uv = ADD_IDX(layerTexCoord.details).uv * texScale + texBias;
+    }
-    ADD_IDX(layerTexCoord.details).uvXZ = (uvXZ * texScaleDetails + texBiasDetails) * texScale + texBias;
-    ADD_IDX(layerTexCoord.details).uvXY = (uvXY * texScaleDetails + texBiasDetails) * texScale + texBias;
-    ADD_IDX(layerTexCoord.details).uvZY = (uvZY * texScaleDetails + texBiasDetails) * texScale + texBias;
+    ADD_IDX(layerTexCoord.details).uvXZ = uvXZ * texScaleDetails + texBiasDetails;
+    ADD_IDX(layerTexCoord.details).uvXY = uvXY * texScaleDetails + texBiasDetails;
+    ADD_IDX(layerTexCoord.details).uvZY = uvZY * texScaleDetails + texBiasDetails;
+
+    if (linkDetailsWithBase > 0.0)
+    {
+        ADD_IDX(layerTexCoord.details).uvXZ = ADD_IDX(layerTexCoord.details).uvXZ * texScale + texBias;
+        ADD_IDX(layerTexCoord.details).uvXY = ADD_IDX(layerTexCoord.details).uvXY * texScale + texBias;
+        ADD_IDX(layerTexCoord.details).uvZY = ADD_IDX(layerTexCoord.details).uvZY * texScale + texBias;
+    }
+
 
     #ifdef SURFACE_GRADIENT
     // This part is only relevant for normal mapping with UV_MAPPING_UVSET
 
     surfaceData.baseColor = SAMPLE_UVMAPPING_TEXTURE2D(ADD_IDX(_BaseColorMap), ADD_ZERO_IDX(sampler_BaseColorMap), ADD_IDX(layerTexCoord.base)).rgb * ADD_IDX(_BaseColor).rgb;
 #ifdef _DETAIL_MAP_IDX
-    surfaceData.baseColor *= LerpWhiteTo(2.0 * detailAlbedo, detailMask * ADD_IDX(_DetailAlbedoScale));
-    // we saturate to avoid to have a smoothness value above 1
-    surfaceData.baseColor = saturate(surfaceData.baseColor);
+    // Use overlay blend mode for detail abledo: (base < 0.5 ? (2.0 * base * blend) : (1.0 - 2.0 * (1.0 - base) * (1.0 - blend)))
+    float3 baseColorOverlay = (detailAlbedo < 0.5) ? 
+                                surfaceData.baseColor * PositivePow(2.0 * detailAlbedo, ADD_IDX(_DetailAlbedoScale)) :
+                                1.0 - (1.0 - surfaceData.baseColor) * PositivePow(2.0 * (1.0 - detailAlbedo), ADD_IDX(_DetailAlbedoScale));
+    // Lerp with details mask
+    surfaceData.baseColor = lerp(surfaceData.baseColor, saturate(baseColorOverlay), detailMask);
 #endif
 
     surfaceData.specularOcclusion = 1.0; // Will be setup outside of this function
 #endif
 
 #ifdef _DETAIL_MAP_IDX
-    surfaceData.perceptualSmoothness *= LerpWhiteTo(2.0 * detailSmoothness, detailMask * ADD_IDX(_DetailSmoothnessScale));
-    // we saturate to avoid to have a smoothness value above 1
-    surfaceData.perceptualSmoothness = saturate(surfaceData.perceptualSmoothness);
+    // Use overlay blend mode for detail abledo: (base < 0.5 ? (2.0 * base * blend) : (1.0 - 2.0 * (1.0 - base) * (1.0 - blend)))
+    float smoothnessOverlay = (detailSmoothness < 0.5) ?
+                                surfaceData.perceptualSmoothness * PositivePow(2.0 * detailSmoothness, ADD_IDX(_DetailSmoothnessScale)) :
+                                1.0 - (1.0 - surfaceData.baseColor) * PositivePow(2.0 * (1.0 - detailSmoothness), ADD_IDX(_DetailSmoothnessScale));
+    // Lerp with details mask
+    surfaceData.perceptualSmoothness = lerp(surfaceData.perceptualSmoothness, saturate(smoothnessOverlay), detailMask);
 #endif
 
     // MaskMap is RGBA: Metallic, Ambient Occlusion (Optional), emissive Mask (Optional), Smoothness

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl

 PROP_DECL_TEX2D(_DetailMap);
 
 TEXTURE2D(_LayerMaskMap);
+SAMPLER2D(sampler_LayerMaskMap);
-SAMPLER2D(sampler_LayerMaskMap);
+SAMPLER2D(sampler_LayerInfluenceMaskMap);
 
 #endif
 
 float _AlphaCutoff;
 float4 _DoubleSidedConstants;
+float _DistortionScale;
+float _DistortionBlurScale;
+float _DistortionBlurRemapMin;
+float _DistortionBlurRemapMax;
 
 float _PPDMaxSamples;
 float _PPDMinSamples;
 // TODO: Fix the code in legacy unity so we can customize the beahvior for GI
 float3 _EmissionColor;
 
+float4 _InvPrimScale; // Only XY are used
+
 // Wind
 float _InitialBend;
 float _Stiffness;
 float4 _SpecularColor;
 
 float _TexWorldScale;
+float _InvTilingScale;
+float _LinkDetailsWithBase;
 
 #else // LAYERED_LIT_SHADER
 
 float4 _LayerMaskMap_ST;
 float _TexWorldScaleBlendMask;
 PROP_DECL(float, _TexWorldScale);
+PROP_DECL(float, _InvTilingScale);
+PROP_DECL(float, _LinkDetailsWithBase);
 
 #endif // LAYERED_LIT_SHADER
 

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitTessellation.hlsl

-float3 GetVertexDisplacement(float3 positionWS, float3 normalWS, float2 texCoord0, float2 texCoord1, float2 texCoord2, float2 texCoord3, float4 vertexColor, float3 objectScale)
+float3 GetVertexDisplacement(float3 positionWS, float3 normalWS, float2 texCoord0, float2 texCoord1, float2 texCoord2, float2 texCoord3, float4 vertexColor)
 {
     // This call will work for both LayeredLit and Lit shader
     LayerTexCoord layerTexCoord;
     // TODO: do this algorithm for lod fetching as lod not available in vertex/domain shader
     // http://www.sebastiansylvan.com/post/the-problem-with-tessellation-in-directx-11/
     float lod = 0.0;
-    float height = ComputePerVertexDisplacement(layerTexCoord, vertexColor, lod);
-    float3 displ = height * normalWS;
-
-    // Applying scaling of the object if requested
-    displ *= objectScale;
-
-    return displ;
+    return ComputePerVertexDisplacement(layerTexCoord, vertexColor, lod) * normalWS;
-void ApplyVertexModification(AttributesMesh input, float3 normalWS, float3 objectScale, inout float3 positionWS)
+void ApplyVertexModification(AttributesMesh input, float3 normalWS, inout float3 positionWS)
-// If tessellation is enabled we apply displacement map after tessellation
-#if defined(_VERTEX_DISPLACEMENT) && !defined(TESSELLATION_ON)
+#if defined(_VERTEX_DISPLACEMENT)
+
     positionWS += GetVertexDisplacement(positionWS, normalWS,
     #ifdef ATTRIBUTES_NEED_TEXCOORD0
         input.uv0,
         float2(0.0, 0.0),
     #endif            
     #ifdef ATTRIBUTES_NEED_COLOR
-        input.color,
+        input.color
-        float4(0.0, 0.0, 0.0, 0.0),
+        float4(0.0, 0.0, 0.0, 0.0)
-        objectScale);
+        );
 #endif
     
 #ifdef _VERTEX_WIND
     bool faceCull = false;
 
 #ifndef _DOUBLESIDED_ON
-    // TODO: Handle inverse culling (for mirror)!
-        faceCull = BackFaceCullTriangle(p0, p1, p2, _TessellationBackFaceCullEpsilon, GetCurrentViewPosition()); // Use shadow view
+        // Handle transform mirroring (like negative scaling)
+        // Caution: don't change p1/p2 directly as it is use later
+        float3 backfaceP1 = unity_WorldTransformParams.w < 0.0 ? p2 : p1;
+        float3 backfaceP2 = unity_WorldTransformParams.w < 0.0 ? p1 : p2;
+
+        faceCull = BackFaceCullTriangle(p0, backfaceP1, backfaceP2, _TessellationBackFaceCullEpsilon, GetCurrentViewPosition()); // Use shadow view
     }
 #endif
 
 // y - 2->0 edge
 // z - 0->1 edge
 // w - inside tessellation factor
-void ApplyTessellationModification(VaryingsMeshToDS input, float3 normalWS, float3 objectScale, inout float3 positionWS)
+void ApplyTessellationModification(VaryingsMeshToDS input, float3 normalWS, inout float3 positionWS)
-#if defined(_VERTEX_DISPLACEMENT)
+#if defined(_TESSELLATION_DISPLACEMENT)
+
     positionWS += GetVertexDisplacement(positionWS, normalWS,
     #ifdef VARYINGS_DS_NEED_TEXCOORD0
         input.texCoord0,
         float2(0.0, 0.0),
     #endif            
     #ifdef VARYINGS_DS_NEED_COLOR
-        input.color,
+        input.color
-        float4(0.0, 0.0, 0.0, 0.0),
+        float4(0.0, 0.0, 0.0, 0.0)
-        objectScale);
-#endif // _VERTEX_DISPLACEMENT
+        );
+#endif // _TESSELLATION_DISPLACEMENT
 }
 
 #endif // #ifdef TESSELLATION_ON

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitTessellation.shader

         _HeightMax("Heightmap Max", Float) = 1
 
         _DetailMap("DetailMap", 2D) = "black" {}
-        _DetailAlbedoScale("_DetailAlbedoScale", Range(-2.0, 2.0)) = 1
+        _DetailAlbedoScale("_DetailAlbedoScale", Range(0.0, 2.0)) = 1
-        _DetailSmoothnessScale("_DetailSmoothnessScale", Range(-2.0, 2.0)) = 1
+        _DetailSmoothnessScale("_DetailSmoothnessScale", Range(0.0, 2.0)) = 1
-        _Anisotropy("Anisotropy", Range(0.0, 1.0)) = 0
+        _Anisotropy("Anisotropy", Range(-1.0, 1.0)) = 0
         _AnisotropyMap("AnisotropyMap", 2D) = "white" {}
 
         _SubsurfaceProfile("Subsurface Profile", Int) = 0
 
         [Enum(UV0, 0, Planar, 4, TriPlanar, 5)] _UVBase("UV Set for base", Float) = 0
         _TexWorldScale("Scale to apply on world coordinate", Float) = 1.0
+        [HideInInspector] _InvTilingScale("Inverse tiling scale = 2 / (abs(_BaseColorMap_ST.x) + abs(_BaseColorMap_ST.y))", Float) = 1
-        [ToggleOff]  _EnablePerPixelDisplacement("Enable per pixel displacement", Float) = 0.0
+        [Enum(None, 0, Vertex displacement, 1, Pixel displacement, 2, Tessellation displacement, 3)] _DisplacementMode("DisplacementMode", Int) = 0
+        [ToggleOff] _DisplacementLockObjectScale("displacement lock object scale", Float) = 1.0
+        [ToggleOff] _DisplacementLockTilingScale("displacement lock tiling scale", Float) = 1.0
+
-        [ToggleOff] _PerPixelDisplacementObjectScale("Per pixel displacement object scale", Float) = 1.0
+        _PPDPrimitiveLength("Primitive length for POM", Float) = 1
+        _PPDPrimitiveWidth("Primitive width for POM", Float) = 1
+        [HideInInspector] _InvPrimScale("Inverse primitive scale for non-planar POM", Vector) = (1, 1, 0, 0)
+        [ToggleOff] _LinkDetailsWithBase("LinkDetailsWithBase", Float) = 1.0
-        // Displacement map
-        [ToggleOff] _EnableVertexDisplacement("Enable vertex displacement", Float) = 0.0
-        [ToggleOff] _VertexDisplacementObjectScale("Vertex displacement object scale", Float) = 1.0
-        [ToggleOff] _VertexDisplacementTilingScale("Vertex displacement tiling height scale", Float) = 1.0
-
         // Wind
         [ToggleOff]  _EnableWind("Enable Wind", Float) = 0.0
         _InitialBend("Initial Bend", float) = 1.0
     #pragma shader_feature _ALPHATEST_ON
     #pragma shader_feature _DEPTHOFFSET_ON
     #pragma shader_feature _DOUBLESIDED_ON
-    #pragma shader_feature _PER_PIXEL_DISPLACEMENT
-    #pragma shader_feature _PER_PIXEL_DISPLACEMENT_OBJECT_SCALE
-    #pragma shader_feature _VERTEX_DISPLACEMENT
-    #pragma shader_feature _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    #pragma shader_feature _VERTEX_DISPLACEMENT_TILING_SCALE
+    #pragma shader_feature _ _VERTEX_DISPLACEMENT _PIXEL_DISPLACEMENT _TESSELLATION_DISPLACEMENT
+    #pragma shader_feature _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE
+    #pragma shader_feature _DISPLACEMENT_LOCK_TILING_SCALE
+    #pragma shader_feature _PIXEL_DISPLACEMENT_LOCK_OBJECT_SCALE
-    #pragma shader_feature _TESSELLATION_PHONG
+    #pragma shader_feature _ _TESSELLATION_PHONG
 
     #pragma shader_feature _ _MAPPING_PLANAR _MAPPING_TRIPLANAR
     #pragma shader_feature _NORMALMAP_TANGENT_SPACE

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/ShaderPass/LitDepthPass.hlsl

 #endif
 
 // Attributes
-#define REQUIRE_TANGENT_TO_WORLD (defined(_HEIGHTMAP) && defined(_PER_PIXEL_DISPLACEMENT))
+#define REQUIRE_TANGENT_TO_WORLD defined(_PIXEL_DISPLACEMENT)
-#define REQUIRE_VERTEX_COLOR (defined(_VERTEX_DISPLACEMENT) && defined(LAYERED_LIT_SHADER) && (defined(_LAYER_MASK_VERTEX_COLOR_MUL) || defined(_LAYER_MASK_VERTEX_COLOR_ADD))) || defined(_VERTEX_WIND)
+#define REQUIRE_VERTEX_COLOR ((defined(_VERTEX_DISPLACEMENT) || defined(_TESSELLATION_DISPLACEMENT)) && defined(LAYERED_LIT_SHADER) && (defined(_LAYER_MASK_VERTEX_COLOR_MUL) || defined(_LAYER_MASK_VERTEX_COLOR_ADD))) || defined(_VERTEX_WIND)
 
 // This first set of define allow to say which attributes will be use by the mesh in the vertex and domain shader (for tesselation)
 
 // If we have a layered shader, any UV can be use for this. To reduce the number of variant we groupt UV0/UV1 and UV2/UV3 instead of having variant for UV0/UV1/UV2/UV3
 // When UVX is present, we assume that UVX - 1 ... UV0 is present
 
-#if defined(_VERTEX_DISPLACEMENT) || REQUIRE_TANGENT_TO_WORLD || defined(_ALPHATEST_ON)
+#if defined(_VERTEX_DISPLACEMENT) || REQUIRE_TANGENT_TO_WORLD || defined(_ALPHATEST_ON) || defined(_TESSELLATION_DISPLACEMENT)
 #define ATTRIBUTES_NEED_TEXCOORD0
     #ifdef LAYERED_LIT_SHADER
     #define ATTRIBUTES_NEED_TEXCOORD1

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/ShaderPass/LitDistortionPass.hlsl

 #endif
 
 // Attributes
-#define REQUIRE_UV_FOR_TESSELATION (defined(TESSELLATION_ON) && (defined(_TESSELLATION_DISPLACEMENT) || defined(_TESSELLATION_DISPLACEMENT_PHONG)))
+#define REQUIRE_UV_FOR_TESSELATION (defined(TESSELLATION_ON) && defined(_TESSELLATION_DISPLACEMENT))
-#define REQUIRE_TANGENT_TO_WORLD (defined(_HEIGHTMAP) && defined(_PER_PIXEL_DISPLACEMENT))
+#define REQUIRE_TANGENT_TO_WORLD (defined(_HEIGHTMAP) && defined(_PIXEL_DISPLACEMENT))
 
 // This first set of define allow to say which attributes will be use by the mesh in the vertex and domain shader (for tesselation)
 

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/ShaderPass/LitVelocityPass.hlsl

 // conflict with the normal in the semantic. This need to be fix! Also no per pixel displacement is possible either.
 
 // Attributes
-#define REQUIRE_TANGENT_TO_WORLD 0 /*  (defined(_HEIGHTMAP) && defined(_PER_PIXEL_DISPLACEMENT)) */
+#define REQUIRE_TANGENT_TO_WORLD 0 /* defined(_PIXEL_DISPLACEMENT) */
-#define REQUIRE_VERTEX_COLOR (defined(_VERTEX_DISPLACEMENT) && defined(LAYERED_LIT_SHADER) && (defined(_LAYER_MASK_VERTEX_COLOR_MUL) || defined(_LAYER_MASK_VERTEX_COLOR_ADD))) || defined(_VERTEX_WIND)
+#define REQUIRE_VERTEX_COLOR ((defined(_VERTEX_DISPLACEMENT) || defined(_TESSELLATION_DISPLACEMENT)) && defined(LAYERED_LIT_SHADER) && (defined(_LAYER_MASK_VERTEX_COLOR_MUL) || defined(_LAYER_MASK_VERTEX_COLOR_ADD))) || defined(_VERTEX_WIND)
 
 // This first set of define allow to say which attributes will be use by the mesh in the vertex and domain shader (for tesselation)
 
 // If we have a layered shader, any UV can be use for this. To reduce the number of variant we groupt UV0/UV1 and UV2/UV3 instead of having variant for UV0/UV1/UV2/UV3
 // When UVX is present, we assume that UVX - 1 ... UV0 is present
 
-#if defined(_VERTEX_DISPLACEMENT) || REQUIRE_TANGENT_TO_WORLD || defined(_ALPHATEST_ON)
+#if defined(_VERTEX_DISPLACEMENT) || REQUIRE_TANGENT_TO_WORLD || defined(_ALPHATEST_ON) || defined(_TESSELLATION_DISPLACEMENT)
 #define ATTRIBUTES_NEED_TEXCOORD0
     #ifdef LAYERED_LIT_SHADER
     #define ATTRIBUTES_NEED_TEXCOORD1

ScriptableRenderPipeline/HDRenderPipeline/Material/Material.hlsl

 //-----------------------------------------------------------------------------
 // This should match the possible blending modes in any material .shader file (lit/layeredlit/unlit etc)
 #if defined(_BLENDMODE_LERP) || defined(_BLENDMODE_ADD) || defined(_BLENDMODE_SOFT_ADD) || defined(_BLENDMODE_MULTIPLY) || defined(_BLENDMODE_PRE_MULTIPLY)
-#   define SURFACE_TYPE_TRANSPARENT
+#define SURFACE_TYPE_TRANSPARENT
-#   define SURFACE_TYPE_OPAQUE
+#define SURFACE_TYPE_OPAQUE
 #endif
 
 //-----------------------------------------------------------------------------

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs

 using System;
 using UnityEngine;
 using UnityEngine.Experimental.Rendering.HDPipeline;
+using UnityEngine.Rendering;
 
 namespace UnityEditor.Experimental.Rendering.HDPipeline
 {
     {
         protected static class StylesBaseUnlit
         {
+            public static string TransparencyInputsText = "Transparency Inputs";
             public static string optionText = "Surface options";
             public static string surfaceTypeText = "Surface Type";
             public static string blendModeText = "Blend Mode";
             public static GUIContent alphaCutoffText = new GUIContent("Alpha Cutoff", "Threshold for alpha cutoff");
             public static GUIContent alphaCutoffShadowText = new GUIContent("Alpha Cutoff Shadow", "Threshold for alpha cutoff in case of shadow pass");
             public static GUIContent alphaCutoffPrepassText = new GUIContent("Alpha Cutoff Prepass", "Threshold for alpha cutoff in case of depth prepass");
-            public static GUIContent transparentDepthPrepassEnableText = new GUIContent("Enable transparent depth prepass", "It allow to ");	
+            public static GUIContent transparentDepthPrepassEnableText = new GUIContent("Enable transparent depth prepass", "It allow to ");
-            public static GUIContent distortionEnableText = new GUIContent("Distortion", "Enable distortion on this shader");
+            public static GUIContent distortionEnableText = new GUIContent("Distortion", "Enable distortion on this shader"); 
+            public static GUIContent distortionVectorMapText = new GUIContent("Distortion Vector Map - Dist(RG) Blur(B)", "Vector Map for the distorsion - Dist(RG) Blur(B)");
+            public static GUIContent distortionBlendModeText = new GUIContent("Distortion Blend Mode", "Distortion Blend Mode");
+            public static GUIContent distortionScaleText = new GUIContent("Distortion Scale", "Distortion Scale");
+            public static GUIContent distortionBlurScaleText = new GUIContent("Distortion Blur Scale", "Distortion Blur Scale");
+            public static GUIContent distortionBlurRemappingText = new GUIContent("Distortion Blur Remapping", "Distortion Blur Remapping");
 
             public static string advancedText = "Advanced Options";
         }
         protected const string kDistortionOnly = "_DistortionOnly";
         protected MaterialProperty distortionDepthTest = null;
         protected const string kDistortionDepthTest = "_DistortionDepthTest";
+        protected MaterialProperty distortionVectorMap = null;
+        protected const string kDistortionVectorMap = "_DistortionVectorMap";
+        protected MaterialProperty distortionBlendMode = null;
+        protected const string kDistortionBlendMode = "_DistortionBlendMode";
+        protected MaterialProperty distortionScale = null;
+        protected const string kDistortionScale = "_DistortionScale";
+        protected MaterialProperty distortionBlurScale = null;
+        protected const string kDistortionBlurScale = "_DistortionBlurScale";
+        protected MaterialProperty distortionBlurRemapMin = null;
+        protected const string kDistortionBlurRemapMin = "_DistortionBlurRemapMin";
+        protected MaterialProperty distortionBlurRemapMax = null;
+        protected const string kDistortionBlurRemapMax = "_DistortionBlurRemapMax";
 
         // See comment in LitProperties.hlsl
         const string kEmissionColor = "_EmissionColor";
             distortionEnable = FindProperty(kDistortionEnable, props, false);
             distortionOnly = FindProperty(kDistortionOnly, props, false);
             distortionDepthTest = FindProperty(kDistortionDepthTest, props, false);
+            distortionVectorMap = FindProperty(kDistortionVectorMap, props, false);
+            distortionBlendMode = FindProperty(kDistortionBlendMode, props, false);
+            distortionScale = FindProperty(kDistortionScale, props, false);
+            distortionBlurScale = FindProperty(kDistortionBlurScale, props, false);
+            distortionBlurRemapMin = FindProperty(kDistortionBlurRemapMin, props, false);
+            distortionBlurRemapMax = FindProperty(kDistortionBlurRemapMax, props, false);
         }
 
         void SurfaceTypePopup()
             if ((SurfaceType)surfaceType.floatValue == SurfaceType.Transparent)
             {
                 BlendModePopup();
-
-                if (distortionEnable != null)
-                {
-                    m_MaterialEditor.ShaderProperty(distortionEnable, StylesBaseUnlit.distortionEnableText);
-
-                    if (distortionEnable.floatValue == 1.0f)
-                    {
-                        EditorGUI.indentLevel++;
-                        m_MaterialEditor.ShaderProperty(distortionOnly, StylesBaseUnlit.distortionOnlyText);
-                        m_MaterialEditor.ShaderProperty(distortionDepthTest, StylesBaseUnlit.distortionDepthTestText);
-                        EditorGUI.indentLevel--;
-                    }
-                }
             }
             m_MaterialEditor.ShaderProperty(alphaCutoffEnable, StylesBaseUnlit.alphaCutoffEnableText);
             if (alphaCutoffEnable.floatValue == 1.0f)
             EditorGUI.indentLevel--;
         }
 
+        protected void DoDistortionInputsGUI()
+        {
+            if (distortionEnable != null)
+            {
+                m_MaterialEditor.ShaderProperty(distortionEnable, StylesBaseUnlit.distortionEnableText);
+
+                if (distortionEnable.floatValue == 1.0f)
+                {
+                    EditorGUI.indentLevel++;
+                    m_MaterialEditor.ShaderProperty(distortionBlendMode, StylesBaseUnlit.distortionBlendModeText);
+                    m_MaterialEditor.ShaderProperty(distortionOnly, StylesBaseUnlit.distortionOnlyText);
+                    m_MaterialEditor.ShaderProperty(distortionDepthTest, StylesBaseUnlit.distortionDepthTestText);
+
+                    EditorGUI.indentLevel++;
+                    m_MaterialEditor.TexturePropertySingleLine(StylesBaseUnlit.distortionVectorMapText, distortionVectorMap);
+                    EditorGUI.indentLevel++;
+                    m_MaterialEditor.ShaderProperty(distortionScale, StylesBaseUnlit.distortionScaleText);
+                    m_MaterialEditor.ShaderProperty(distortionBlurScale, StylesBaseUnlit.distortionBlurScaleText);
+                    float remapMin = distortionBlurRemapMin.floatValue;
+                    float remapMax = distortionBlurRemapMax.floatValue;
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUILayout.MinMaxSlider(StylesBaseUnlit.distortionBlurRemappingText, ref remapMin, ref remapMax, 0.0f, 1.0f);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        distortionBlurRemapMin.floatValue = remapMin;
+                        distortionBlurRemapMax.floatValue = remapMax;
+                    }
+                    EditorGUI.indentLevel--;
+
+                    EditorGUI.indentLevel--;
+
+                    EditorGUI.indentLevel--;
+                }
+            }
+        }
+
         static public void SetKeyword(Material m, string keyword, bool state)
         {
             if (state)
             bool alphaTestEnable = material.GetFloat(kAlphaCutoffEnabled) > 0.0f;
             SurfaceType surfaceType = (SurfaceType)material.GetFloat(kSurfaceType);
             BlendMode blendMode = (BlendMode)material.GetFloat(kBlendMode);
+
+            // These need to always been set either with opaque or transparent! So a users can swtich to opaque and remove the keyword correctly
+            SetKeyword(material, "_BLENDMODE_LERP", false);
+            SetKeyword(material, "_BLENDMODE_ADD", false);
+            SetKeyword(material, "_BLENDMODE_SOFT_ADD", false);
+            SetKeyword(material, "_BLENDMODE_MULTIPLY", false);
+            SetKeyword(material, "_BLENDMODE_PRE_MULTIPLY", false);
 
             if (surfaceType == SurfaceType.Opaque)
             {
             SetKeyword(material, "_ALPHATEST_ON", alphaTestEnable);
 
             if (material.HasProperty(kDistortionEnable))
-            {                
+            {
                 bool distortionDepthTest = material.GetFloat(kDistortionDepthTest) > 0.0f;
                 if (distortionDepthTest)
                 {
                 {
                     material.SetInt("_ZTestMode", (int)UnityEngine.Rendering.CompareFunction.Always);
                 }
+
+                var distortionBlendMode = material.GetInt(kDistortionBlendMode);
+                switch (distortionBlendMode)
+
+                {
+                    default:
+                    case 0: // Add
+                    {
+                        material.SetInt("_DistortionSrcBlend", (int)UnityEngine.Rendering.BlendMode.One);
+                        material.SetInt("_DistortionDstBlend", (int)UnityEngine.Rendering.BlendMode.One);
+
+                        material.SetInt("_DistortionBlurSrcBlend", (int)UnityEngine.Rendering.BlendMode.One);
+                        material.SetInt("_DistortionBlurDstBlend", (int)UnityEngine.Rendering.BlendMode.One);
+                        material.SetInt("_DistortionBlurBlendOp", (int)UnityEngine.Rendering.BlendOp.Max);
+                            break;
+                    }
+                    case 1: // Multiply
+                        material.SetInt("_DistortionSrcBlend", (int)UnityEngine.Rendering.BlendMode.DstColor);
+                        material.SetInt("_DistortionDstBlend", (int)UnityEngine.Rendering.BlendMode.Zero);
+
+                        material.SetInt("_DistortionBlurSrcBlend", (int)UnityEngine.Rendering.BlendMode.DstAlpha);
+                        material.SetInt("_DistortionBlurDstBlend", (int)UnityEngine.Rendering.BlendMode.Zero);
+                        material.SetInt("_DistortionBlurBlendOp", (int)UnityEngine.Rendering.BlendOp.Add);
+                        break;
+                }
             }
 
             // A material's GI flag internally keeps track of whether emission is enabled at all, it's enabled but has no effect
 
                 // If distortion only is enabled, disable all passes (except distortion and debug)
                 bool enablePass = !(distortionEnable && distortionOnly);
-                
+
-                material.SetShaderPassEnabled(HDShaderPassNames.s_ForwardOnlyOpaqueDepthOnlyStr, enablePass);
-                material.SetShaderPassEnabled(HDShaderPassNames.s_ForwardOnlyOpaqueStr, enablePass);
-                material.SetShaderPassEnabled(HDShaderPassNames.s_ForwardOnlyOpaqueDebugDisplayStr, true);
+                material.SetShaderPassEnabled(HDShaderPassNames.s_DepthForwardOnlyStr, enablePass);
+                material.SetShaderPassEnabled(HDShaderPassNames.s_ForwardOnlyStr, enablePass);
+                material.SetShaderPassEnabled(HDShaderPassNames.s_ForwardOnlyDebugDisplayStr, true);
                 material.SetShaderPassEnabled(HDShaderPassNames.s_GBufferStr, enablePass);
                 material.SetShaderPassEnabled(HDShaderPassNames.s_GBufferWithPrepassStr, enablePass);
                 material.SetShaderPassEnabled(HDShaderPassNames.s_GBufferDebugDisplayStr, true);

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/UnlitUI.cs

 
             m_MaterialEditor.TexturePropertySingleLine(Styles.emissiveText, emissiveColorMap, emissiveColor);
             m_MaterialEditor.ShaderProperty(emissiveIntensity, Styles.emissiveIntensityText);
+
+            var surfaceTypeValue = (SurfaceType)surfaceType.floatValue;
+            if (surfaceTypeValue == SurfaceType.Transparent)
+            {
+                EditorGUILayout.Space();
+                EditorGUILayout.LabelField(StylesBaseUnlit.TransparencyInputsText, EditorStyles.boldLabel);
+                ++EditorGUI.indentLevel;
+
+                DoDistortionInputsGUI();
+
+                --EditorGUI.indentLevel;
+            }
         }
 
         protected override void VertexAnimationPropertiesGUI()

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Unlit.shader

         [ToggleOff] _DistortionEnable("Enable Distortion", Float) = 0.0
         [ToggleOff] _DistortionOnly("Distortion Only", Float) = 0.0
         [ToggleOff] _DistortionDepthTest("Distortion Depth Test Enable", Float) = 0.0
+        [Enum(Add, 0, Multiply, 1)] _DistortionBlendMode("Distortion Blend Mode", Int) = 0
+        [HideInInspector] _DistortionSrcBlend("Distortion Blend Src", Int) = 0
+        [HideInInspector] _DistortionDstBlend("Distortion Blend Dst", Int) = 0
+        [HideInInspector] _DistortionBlurSrcBlend("Distortion Blur Blend Src", Int) = 0
+        [HideInInspector] _DistortionBlurDstBlend("Distortion Blur Blend Dst", Int) = 0
+        [HideInInspector] _DistortionBlurBlendMode("Distortion Blur Blend Mode", Int) = 0
+        _DistortionScale("Distortion Scale", Float) = 1
+        _DistortionBlurScale("Distortion Blur Scale", Float) = 1
+        _DistortionBlurRemapMin("DistortionBlurRemapMin", Float) = 0.0
+        _DistortionBlurRemapMax("DistortionBlurRemapMax", Float) = 1.0
 
         [ToggleOff]  _AlphaCutoffEnable("Alpha Cutoff Enable", Float) = 0.0
         _AlphaCutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
             Name "Distortion" // Name is not used
             Tags { "LightMode" = "DistortionVectors" } // This will be only for transparent object based on the RenderQueue index
 
-            Blend One One
+            Blend [_DistortionSrcBlend] [_DistortionDstBlend], [_DistortionBlurSrcBlend] [_DistortionBlurDstBlend]
+            BlendOp Add, [_DistortionBlurBlendOp]
             ZTest [_ZTestMode]
             ZWrite off
             Cull [_CullMode]
             ENDHLSL
         }
 
+        // Unlit shader always render in forward
-            Name "ForwardUnlit"
-            Tags { "LightMode" = "Forward" }
-
-            Blend [_SrcBlend] [_DstBlend]
-            ZWrite [_ZWrite]
-            Cull [_CullMode]
-
-            HLSLPROGRAM
-
-            #define SHADERPASS SHADERPASS_FORWARD_UNLIT
-            #include "../../Material/Material.hlsl"
-            #include "ShaderPass/UnlitSharePass.hlsl"
-            #include "UnlitData.hlsl"
-            #include "../../ShaderPass/ShaderPassForwardUnlit.hlsl"
+            Name ""
+            Tags{ "LightMode" = "DepthForwardOnly" }
-            ENDHLSL
-        }
-
-        Pass
-        {
-            Name "ForwardDebugDisplay"
-            Tags { "LightMode" = "ForwardDebugDisplay" }
+            Cull[_CullMode]
-            Blend [_SrcBlend] [_DstBlend]
-            ZWrite [_ZWrite]
-            Cull [_CullMode]
+            ZWrite On
-            #define DEBUG_DISPLAY
-            #define SHADERPASS SHADERPASS_FORWARD_UNLIT
-            #include "../../Debug/DebugDisplay.hlsl"
+            #define SHADERPASS SHADERPASS_DEPTH_ONLY
+            #include "../../ShaderVariables.hlsl"
-            #include "ShaderPass/UnlitSharePass.hlsl"
+            #include "ShaderPass/UnlitDepthPass.hlsl"
-            #include "../../ShaderPass/ShaderPassForwardUnlit.hlsl"
+            #include "../../ShaderPass/ShaderPassDepthOnly.hlsl"
-        // Unlit opaque material need to be render with ForwardOnlyOpaque. Unlike Lit that can be both deferred and forward,
-        // unlit require to be forward only, that's why we need this pass. Unlit transparent will use regular Forward pass
-        // (Code is exactly the same as "Forward", it simply allow our system to filter objects correctly)
+        // Unlit shader always render in forward
-            Tags { "LightMode" = "ForwardOnlyOpaque" }
+            Tags { "LightMode" = "ForwardOnly" }
 
             Blend [_SrcBlend] [_DstBlend]
             ZWrite [_ZWrite]
 
         Pass
         {
-            Name "ForwardUnlit"
-            Tags { "LightMode" = "ForwardOnlyOpaqueDebugDisplay" }
+            Name "ForwardDebugDisplay"
+            Tags { "LightMode" = "ForwardOnlyDebugDisplay" }
 
             Blend [_SrcBlend] [_DstBlend]
             ZWrite [_ZWrite]
 
+            #define DEBUG_DISPLAY
             #define SHADERPASS SHADERPASS_FORWARD_UNLIT
             #include "../../Debug/DebugDisplay.hlsl"
             #include "../../Material/Material.hlsl"

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/UnlitData.hlsl

 // Fill SurfaceData/Builtin data function
 //-------------------------------------------------------------------------------------
 
+void DoAlphaTest(float alpha, float alphaCutoff)
+{
+    // Don't do the clip when rendering forward opaque (unlit). Forward opaque always have a prepass (with depth test on)
+#if !(SHADERPASS == SHADERPASS_FORWARD_UNLIT && defined(SURFACE_TYPE_OPAQUE))
+    clip(alpha - alphaCutoff);
+#endif
+}
+
 void GetSurfaceAndBuiltinData(FragInputs input, float3 V, inout PositionInputs posInput, out SurfaceData surfaceData, out BuiltinData builtinData)
 {
     surfaceData.color = SAMPLE_TEXTURE2D(_ColorMap, sampler_ColorMap, input.texCoord0).rgb * _Color.rgb;
-    clip(alpha - _AlphaCutoff);
+    DoAlphaTest(alpha, _AlphaCutoff);
 #endif
 
     // Builtin Data
 
 #if (SHADERPASS == SHADERPASS_DISTORTION)
     float3 distortion = SAMPLE_TEXTURE2D(_DistortionVectorMap, sampler_DistortionVectorMap, input.texCoord0).rgb;
-    builtinData.distortion = distortion.rg;
-    builtinData.distortionBlur = distortion.b;
+    builtinData.distortion = distortion.rg * _DistortionScale;
+    builtinData.distortionBlur = clamp(distortion.b * _DistortionBlurScale, 0.0, 1.0) * (_DistortionBlurRemapMax - _DistortionBlurRemapMin) + _DistortionBlurRemapMin;
 #else
     builtinData.distortion = float2(0.0, 0.0);
     builtinData.distortionBlur = 0.0;

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/UnlitProperties.hlsl

-float4  _Color;
+float4  _Color;
 TEXTURE2D(_ColorMap);
 SAMPLER2D(sampler_ColorMap);
 
 float _EmissiveIntensity;
 
 float _AlphaCutoff;
+float _DistortionScale;
+float _DistortionBlurScale;
+float _DistortionBlurRemapMin;
+float _DistortionBlurRemapMax;
 
 // Caution: C# code in BaseLitUI.cs call LightmapEmissionFlagsProperty() which assume that there is an existing "_EmissionColor"
 // value that exist to identify if the GI emission need to be enabled.

ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/HDRenderPipelineResources.asset

   gaussianPyramidCS: {fileID: 7200000, guid: 6dba4103d23a7904fbc49099355aff3e, type: 3}
   depthPyramidCS: {fileID: 7200000, guid: 64a553bb564274041906f78ffba955e4, type: 3}
   copyChannelCS: {fileID: 7200000, guid: a68d8aaeb0956234d94e389f196381ee, type: 3}
+  applyDistortionCS: {fileID: 7200000, guid: 2fa6c0e3fe6dc3145a4156f21913fe5c, type: 3}
   clearDispatchIndirectShader: {fileID: 7200000, guid: fc1f553acb80a6446a32d33e403d0656,
     type: 3}
   buildDispatchIndirectShader: {fileID: 7200000, guid: 4eb1b418be7044c40bb5200496c50f14,

ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/HDRenderPipelineResources.asset.meta

 fileFormatVersion: 2
 guid: 42086e81f4f0c724f96f7f09cc995354
-timeCreated: 1507124092
+timeCreated: 1507194928
 licenseType: Pro
 NativeFormatImporter:
   externalObjects: {}

ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/RenderPipelineResources.cs

         public ComputeShader gaussianPyramidCS;
         public ComputeShader depthPyramidCS;
         public ComputeShader copyChannelCS;
+        public ComputeShader applyDistortionCS;
 
         // Lighting tile pass resources
         public ComputeShader clearDispatchIndirectShader;
         public Shader GGXConvolve;
 
         public Shader skyboxCubemap;
+
+        public int applyDistortionKernel { get; private set; }
+
+        void OnEnable()
+        {
+            applyDistortionKernel = -1;
+
+            if (applyDistortionCS != null)
+                applyDistortionKernel = applyDistortionCS.FindKernel("KMain");
+        }
     }
 }

ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassDistortion.hlsl

     GetSurfaceAndBuiltinData(input, V, posInput, surfaceData, builtinData);
 
     float4 outBuffer;
-    EncodeDistortion(builtinData.distortion, builtinData.distortionBlur, outBuffer);
+    // Mark this pixel as eligible as source for distortion
+    EncodeDistortion(builtinData.distortion, builtinData.distortionBlur, true, outBuffer);
     return outBuffer;
 }

ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/TessellationShare.hlsl

 #endif
 
 #ifdef HAVE_TESSELLATION_MODIFICATION
-    // TODO: This should be an uniform for the object, this code should be remove (and is specific to Lit.shader) once we have it. - Workaround for now
-    // Extract scaling from world transform
-    #ifdef _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    float3 objectScale = varying.vmesh.objectScale; 
-    #else
-    float3 objectScale = float3(1.0, 1.0, 1.0);
-    #endif
-    ApplyTessellationModification(varying.vmesh, varying.vmesh.normalWS, objectScale, varying.vmesh.positionWS);
+    ApplyTessellationModification(varying.vmesh, varying.vmesh.normalWS, varying.vmesh.positionWS);
 #endif
 
     return VertTesselation(varying);

ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/VaryingMesh.hlsl

 #ifdef VARYINGS_DS_NEED_COLOR
     float4 color;
 #endif
-#ifdef _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    float3 objectScale;
-#endif
 };
 
 struct PackedVaryingsMeshToDS
 #ifdef VARYINGS_DS_NEED_COLOR
     float4 interpolators5 : TEXCOORD2;
 #endif
-
-#ifdef _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    float3 interpolators6 : TEXCOORD3;
-#endif
 };
 
 // Functions to pack data to use as few interpolator as possible, the ShaderGraph should generate these functions
 #endif
 #ifdef VARYINGS_DS_NEED_COLOR
     output.interpolators5 = input.color;
-#endif
-#ifdef _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    output.interpolators6 = input.objectScale;
 #endif
 
     return output;
 #ifdef VARYINGS_DS_NEED_COLOR
     output.color = input.interpolators5;
 #endif
-#ifdef _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    output.objectScale = input.interpolators6;
-#endif
+
     return output;
 }
 
 #endif
 #ifdef VARYINGS_DS_NEED_COLOR
     TESSELLATION_INTERPOLATE_BARY(color, baryCoords);
-#endif
-
-#ifdef _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    // objectScale doesn't change for the whole object.
-    ouput.objectScale = input0.objectScale;
 #endif
 
     return ouput;

ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/VertMesh.hlsl

     float4 tangentWS = float4(TransformObjectToWorldDir(input.tangentOS.xyz), input.tangentOS.w);
 #endif
 
-    // TODO: This should be an uniform for the object, this code should be remove (and is specific to Lit.shader) once we have it. - Workaround for now
-    // Extract scaling from world transform
-#ifdef _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    float3 objectScale;
-    float4x4 worldTransform = GetObjectToWorldMatrix();
-    objectScale.x = length(float3(worldTransform._m00, worldTransform._m01, worldTransform._m02));
-    objectScale.y = length(float3(worldTransform._m10, worldTransform._m11, worldTransform._m12));
-    objectScale.z = length(float3(worldTransform._m20, worldTransform._m21, worldTransform._m22));
-#else
-    float3 objectScale = float3(1.0, 1.0, 1.0);
-#endif
-
-    ApplyVertexModification(input, normalWS, objectScale, positionWS);
+    ApplyVertexModification(input, normalWS, positionWS);
 #endif
 
     positionWS = GetCameraRelativePositionWS(positionWS);
-    #ifdef _VERTEX_DISPLACEMENT_OBJECT_SCALE
-    // TODO: This should be an uniform for the object, this code should be remove (and is specific to Lit.shader) once we have it. - Workaround for now
-    output.objectScale = objectScale;
-    #endif
     // TODO: TEMP: Velocity has a flow as it doens't have normal. This need to be fix. In the mean time, generate fix normal so compiler doesn't complain - When fix, think to also enable ATTRIBUTES_NEED_NORMAL in LitVelocityPass.hlsl
     #if (SHADERPASS == SHADERPASS_VELOCITY)
     output.normalWS = float3(0.0, 0.0, 1.0);

ScriptableRenderPipeline/LightweightPipeline/Editor/ShaderGUI/LightweightStandardGUI.cs

             public static readonly string[] specularSmoothnessChannelNames = {"Specular Alpha", "Albedo Alpha"};
         }
 
-        #pragma warning disable CS0414
+        #pragma warning disable 0414
         private MaterialProperty workflowMode = null;
         private MaterialProperty blendMode = null;
 
         private ColorPickerHDRConfig m_ColorPickerHDRConfig = new ColorPickerHDRConfig(0f, kMaxfp16, 1 / kMaxfp16, 3f);
 
         private bool m_FirstTimeApply = true;
-        #pragma warning restore CS0414
+        #pragma warning restore 0414
 
         public void FindProperties(MaterialProperty[] props)
         {

ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs

 
         private Camera m_CurrCamera = null;
 
-        private int m_LightIndicesCount = 0;
         private ComputeBuffer m_LightIndexListBuffer;
 
         private static readonly int kMaxCascades = 4;
         private RenderTargetIdentifier m_CameraDepthRT;
         private RenderTargetIdentifier m_CameraCopyDepthRT;
 
-        private bool m_RenderToIntermediateTarget = false;
         private bool m_IntermediateTextureArray = false;
 
         private const int kShadowDepthBufferBits = 16;
             {
                 m_LightIndexListBuffer.Dispose();
                 m_LightIndexListBuffer = null;
-                m_LightIndicesCount = 0;
             }
         }
 

TestbedPipelines/Fptl/FptlLighting.cs

             }
             else
             {
-                #pragma warning disable CS0162
+                #pragma warning disable 0162
-                #pragma warning restore CS0162
+                #pragma warning restore 0162
             }
 
             CommandBuffer cmdShadow = CommandBufferPool.Get();
             }
             else
             {
-                #pragma warning disable CS0162
+                #pragma warning disable 0162
-                #pragma warning restore CS0162
+                #pragma warning restore 0162
             }
 
             // do deferred lighting

Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/HDRPAsset/HDRenderPipelineResourcesTest.asset

   gaussianPyramidCS: {fileID: 7200000, guid: 6dba4103d23a7904fbc49099355aff3e, type: 3}
   depthPyramidCS: {fileID: 7200000, guid: 64a553bb564274041906f78ffba955e4, type: 3}
   copyChannelCS: {fileID: 7200000, guid: a68d8aaeb0956234d94e389f196381ee, type: 3}
+  applyDistortionCS: {fileID: 7200000, guid: 2fa6c0e3fe6dc3145a4156f21913fe5c, type: 3}
   clearDispatchIndirectShader: {fileID: 7200000, guid: fc1f553acb80a6446a32d33e403d0656,
     type: 3}
   buildDispatchIndirectShader: {fileID: 7200000, guid: 4eb1b418be7044c40bb5200496c50f14,

SampleScenes/HDTest/DistortionTest.unity.meta

+fileFormatVersion: 2
+guid: b2e28eaefe0c2724190bc74e3c9d11c9
+timeCreated: 1475076282
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/AnimationController.meta

+fileFormatVersion: 2
+guid: 48cd8a5ad3a61624db56c2e78890340f
+folderAsset: yes
+timeCreated: 1507649048
+licenseType: Pro
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/CustomTexture.meta

+fileFormatVersion: 2
+guid: edcd9983c0a7e154381e8f596d33e02f
+folderAsset: yes
+timeCreated: 1507196699
+licenseType: Pro
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Mat_Distorsion_Lit_2DNoise
+  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONNULLIFY_OFF _DISTORTIONONLY_OFF
+    _DISTORTION_ON _DOUBLESIDEDENABLE_OFF _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF
+    _ENABLEVERTEXDISPLACEMENT_OFF _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 2800000, guid: 8abdc3adb95657847a5a8f760fdfc843, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 8600000, guid: 99d420ed53cf5bc449b014653d05770d, type: 2}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 0
+    - _DistortionBlendOp: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1.93
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDepthTest: 0
+    - _DistortionDstBlend: 1
+    - _DistortionEnable: 1
+    - _DistortionNullify: 0
+    - _DistortionOnly: 0
+    - _DistortionScale: 2.21
+    - _DistortionSrcBlend: 1
+    - _DistortionStencilRef: 4
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InitialBend: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 8
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise.mat.meta

+fileFormatVersion: 2
+guid: 794a18d1b259ac9408ce57d9b3d5a3ca
+timeCreated: 1507195204
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Only_2DNoise.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Mat_Distorsion_Lit_Only_2DNoise
+  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONNULLIFY_OFF _DISTORTION_ON
+    _DOUBLESIDEDENABLE_OFF _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF
+    _ENABLEVERTEXDISPLACEMENT_OFF _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - Forward
+  - ForwardOnlyOpaqueDepthOnly
+  - ForwardOnlyOpaque
+  - GBuffer
+  - GBufferWithPrepass
+  - MOTIONVECTORS
+  - TransparentDepthPrepass
+  - META
+  - SHADOWCASTER
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 8600000, guid: 99d420ed53cf5bc449b014653d05770d, type: 2}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 0
+    - _DistortionBlendOp: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDepthTest: 0
+    - _DistortionDstBlend: 1
+    - _DistortionEnable: 1
+    - _DistortionNullify: 0
+    - _DistortionOnly: 1
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 1
+    - _DistortionStencilRef: 4
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InitialBend: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 8
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Only_2DNoise.mat.meta

+fileFormatVersion: 2
+guid: 83ec3bd906ef2d442ad5caa8ecce9d15
+timeCreated: 1507195204
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Only_Ripple.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Mat_Distorsion_Lit_Only_Ripple
+  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONNULLIFY_OFF _DISTORTION_ON _DOUBLESIDEDENABLE_OFF
+    _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF _ENABLEVERTEXDISPLACEMENT_OFF
+    _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - Forward
+  - ForwardOnlyOpaqueDepthOnly
+  - ForwardOnlyOpaque
+  - GBuffer
+  - GBufferWithPrepass
+  - MOTIONVECTORS
+  - TransparentDepthPrepass
+  - META
+  - SHADOWCASTER
+  - DepthOnly
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 8600000, guid: b47c3f363d01c934e91b198a745925eb, type: 2}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 0
+    - _DistortionBlendOp: 21
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 0.92805755
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDepthTest: 1
+    - _DistortionDstBlend: 1
+    - _DistortionEnable: 1
+    - _DistortionNullify: 0
+    - _DistortionOnly: 1
+    - _DistortionScale: 0.92
+    - _DistortionSrcBlend: 1
+    - _DistortionStencilRef: 4
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InitialBend: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 4
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Only_Ripple.mat.meta

+fileFormatVersion: 2
+guid: 12b78618760f1ed418b720ef565ac193
+timeCreated: 1507195204
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Reject.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Mat_Distorsion_Lit_Reject
+  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONNULLIFY_OFF _DISTORTION_ON
+    _DOUBLESIDEDENABLE_OFF _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF
+    _ENABLEVERTEXDISPLACEMENT_OFF _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - Forward
+  - MOTIONVECTORS
+  - ForwardOnlyOpaqueDepthOnly
+  - ForwardOnlyOpaque
+  - GBuffer
+  - GBufferWithPrepass
+  - TransparentDepthPrepass
+  - META
+  - SHADOWCASTER
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 1
+    - _DistortionBlendOp: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 0
+    - _DistortionBlurScale: 0
+    - _DistortionBlurSrcBlend: 7
+    - _DistortionDepthTest: 0
+    - _DistortionDstBlend: 0
+    - _DistortionEnable: 1
+    - _DistortionNullify: 0
+    - _DistortionOnly: 1
+    - _DistortionScale: 0
+    - _DistortionSrcBlend: 2
+    - _DistortionStencilRef: 4
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InitialBend: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 8
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Reject.mat.meta

+fileFormatVersion: 2
+guid: 8bef593041e9c7b4e9bf34832917e46a
+timeCreated: 1507195204
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Voronoi.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Mat_Distorsion_Lit_Voronoi
+  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONNULLIFY_OFF _DISTORTION_ON
+    _DOUBLESIDEDENABLE_OFF _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF
+    _ENABLEVERTEXDISPLACEMENT_OFF _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  - Forward
+  - SHADOWCASTER
+  - ForwardOnlyOpaqueDepthOnly
+  - ForwardOnlyOpaque
+  - GBuffer
+  - GBufferWithPrepass
+  - TransparentDepthPrepass
+  - META
+  - DepthOnly
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 8600000, guid: 857ebf2cca737d54194a3a1077fec4cc, type: 2}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 0
+    - _DistortionBlendOp: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0.097841725
+    - _DistortionBlurScale: 1.5
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDepthTest: 0
+    - _DistortionDstBlend: 1
+    - _DistortionEnable: 1
+    - _DistortionNullify: 0
+    - _DistortionOnly: 1
+    - _DistortionScale: 200000
+    - _DistortionSrcBlend: 1
+    - _DistortionStencilRef: 4
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InitialBend: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 8
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Voronoi.mat.meta

+fileFormatVersion: 2
+guid: ce8d49797f4d3e146b1c481b1b270b6c
+timeCreated: 1507195204
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_2DNoise.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Mat_Distorsion_Unlit_2DNoise
+  m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONNULLIFY_OFF _DISTORTIONONLY_OFF
+    _DISTORTION_ON _DOUBLESIDEDENABLE_OFF _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF
+    _ENABLEVERTEXDISPLACEMENT_OFF _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ColorMap:
+        m_Texture: {fileID: 2800000, guid: 8abdc3adb95657847a5a8f760fdfc843, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 8600000, guid: 99d420ed53cf5bc449b014653d05770d, type: 2}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDepthTest: 0
+    - _DistortionDstBlend: 1
+    - _DistortionEnable: 1
+    - _DistortionNullify: 0
+    - _DistortionOnly: 0
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 1
+    - _DistortionStencilRef: 4
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InitialBend: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 8
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_2DNoise.mat.meta

+fileFormatVersion: 2
+guid: 8ebe323c65d3680468660e8853a19676
+timeCreated: 1507195204
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Only_2DNoise.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Mat_Distorsion_Unlit_Only_2DNoise
+  m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONNULLIFY_OFF _DISTORTION_ON
+    _DOUBLESIDEDENABLE_OFF _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF
+    _ENABLEVERTEXDISPLACEMENT_OFF _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - GBuffer
+  - META
+  - SHADOWCASTER
+  - TransparentDepthPrepass
+  - MOTIONVECTORS
+  - Forward
+  - ForwardOnlyOpaqueDepthOnly
+  - ForwardOnlyOpaque
+  - GBufferWithPrepass
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 8600000, guid: 99d420ed53cf5bc449b014653d05770d, type: 2}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDepthTest: 0
+    - _DistortionDstBlend: 1
+    - _DistortionEnable: 1
+    - _DistortionNullify: 0
+    - _DistortionOnly: 1
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 1
+    - _DistortionStencilRef: 4
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InitialBend: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 8
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Only_2DNoise.mat.meta

+fileFormatVersion: 2
+guid: 114a42051debc3744aacf3869a089ffe
+timeCreated: 1507195204
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Only_Ripple.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Mat_Distorsion_Unlit_Only_Ripple
+  m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONNULLIFY_OFF _DISTORTION_ON _DOUBLESIDEDENABLE_OFF
+    _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF _ENABLEVERTEXDISPLACEMENT_OFF
+    _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - GBuffer
+  - META
+  - SHADOWCASTER
+  - TransparentDepthPrepass
+  - MOTIONVECTORS
+  - Forward
+  - ForwardOnlyOpaqueDepthOnly
+  - ForwardOnlyOpaque
+  - GBufferWithPrepass
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 8600000, guid: b47c3f363d01c934e91b198a745925eb, type: 2}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDepthTest: 1
+    - _DistortionDstBlend: 1
+    - _DistortionEnable: 1
+    - _DistortionNullify: 0
+    - _DistortionOnly: 1
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 1
+    - _DistortionStencilRef: 4
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InitialBend: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 4
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Only_Ripple.mat.meta

+fileFormatVersion: 2
+guid: f7ab0c70df8099e48a29dac7439299a8
+timeCreated: 1507195204
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Reject.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Mat_Distorsion_Unlit_Reject
+  m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTION_ON _DOUBLESIDEDENABLE_OFF
+    _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF _ENABLEVERTEXDISPLACEMENT_OFF
+    _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - GBuffer
+  - META
+  - SHADOWCASTER
+  - DepthOnly
+  - MOTIONVECTORS
+  - Forward
+  - ForwardOnlyOpaqueDepthOnly
+  - ForwardOnlyOpaque
+  - GBufferWithPrepass
+  - TransparentDepthPrepass
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 1
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 0
+    - _DistortionBlurScale: 0
+    - _DistortionBlurSrcBlend: 7
+    - _DistortionDepthTest: 0
+    - _DistortionDstBlend: 0
+    - _DistortionEnable: 1
+    - _DistortionNullify: 1
+    - _DistortionOnly: 1
+    - _DistortionScale: 0
+    - _DistortionSrcBlend: 2
+    - _DistortionStencilRef: 0
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InitialBend: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 8
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Reject.mat.meta

+fileFormatVersion: 2
+guid: 2d26272d0e9ca474eab6f1e6b8f70cf5
+timeCreated: 1507195204
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Fire.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Mat_Fire
+  m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_LERP
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONNULLIFY_OFF _DISTORTIONONLY_OFF
+    _DOUBLESIDEDENABLE_OFF _ENABLEPERPIXELDISPLACEMENT_OFF _ENABLESPECULAROCCLUSION_OFF
+    _ENABLEVERTEXDISPLACEMENT_OFF _ENABLEWIND_OFF
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ColorMap:
+        m_Texture: {fileID: 2800000, guid: e394d1c1e9b289443936483ad0c5ebeb, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 2800000, guid: ac92c0f4bdc82e84fbd6dc4c7ec78f95, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionBlendMode: 1
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 0
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 7
+    - _DistortionDepthTest: 0
+    - _DistortionDstBlend: 0
+    - _DistortionEnable: 1
+    - _DistortionNullify: 0
+    - _DistortionOnly: 0
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 2
+    - _DistortionStencilRef: 4
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InitialBend: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PerPixelDisplacementObjectScale: 1
+    - _RefractionMode: 0
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 8
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Fire.mat.meta

+fileFormatVersion: 2
+guid: 889e40ad454f5d44da706bce9dc12ef4
+timeCreated: 1507639400
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Textures/Fire_6x10.png.meta

+fileFormatVersion: 2
+guid: e394d1c1e9b289443936483ad0c5ebeb
+timeCreated: 1507639328
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: tvOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/GraphicTest/Common/Textures/Fire_6x10_alpha.tga.meta

+fileFormatVersion: 2
+guid: ac92c0f4bdc82e84fbd6dc4c7ec78f95
+timeCreated: 1507640812
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 0
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: tvOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ScriptableRenderPipeline/HDRenderPipeline/Editor/HDBaseEditor.cs

+using UnityEngine.Experimental.Rendering;
+using UnityEngine.Experimental.Rendering.HDPipeline;
+
+namespace UnityEditor.Experimental.Rendering.HDPipeline
+{
+    using UnityObject = UnityEngine.Object;
+
+    //
+    // Sample use:
+    //
+    // [CustomEditor(typeof(TestComponent)]
+    // class TestEditor : HDBaseEditor<TestComponent>
+    // {
+    //     SerializedProperty m_MyFloat;
+    //
+    //     protected override void OnEnable()
+    //     {
+    //         base.OnEnable();
+    //         m_MyFloat = properties.Find(x => x.myFloat);
+    //     }
+    //
+    //     public override void OnInspectorGUI()
+    //     {
+    //         EditorGUILayout.PropertyField(m_MyFloat);
+    //     }
+    // }
+    //
+    public class HDBaseEditor<T> : Editor
+        where T : UnityObject
+    {
+        internal PropertyFetcher<T> properties { get; private set; }
+
+        protected T m_Target
+        {
+            get { return target as T; }
+        }
+
+        protected T[] m_Targets
+        {
+            get { return targets as T[]; }
+        }
+
+        protected HDRenderPipeline m_HDPipeline
+        {
+            get { return RenderPipelineManager.currentPipeline as HDRenderPipeline; }
+        }
+
+        protected virtual void OnEnable()
+        {
+            properties = new PropertyFetcher<T>(serializedObject);
+        }
+    }
+}

ScriptableRenderPipeline/HDRenderPipeline/Editor/HDBaseEditor.cs.meta

+fileFormatVersion: 2
+guid: 4db007e1d2c155d4a80e2a38f39b39ff
+timeCreated: 1507624455
+licenseType: Pro
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: