HDRenderPipeline: Batch of fix for tesselation shaders

Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader

 
         [HideInInspector] _LayerCount("_LayerCount", Float) = 2.0
 
-		// WARNING
-		// All the following properties that concern the UV mapping are the same as in the Lit shader.
-		// This means that they will get overridden when synchronizing the various layers.
-		// To avoid this, make sure that all properties here are in the exclusion list in LayeredLitUI.SynchronizeLayerProperties
+        // WARNING
+        // All the following properties that concern the UV mapping are the same as in the Lit shader.
+        // This means that they will get overridden when synchronizing the various layers.
+        // To avoid this, make sure that all properties here are in the exclusion list in LayeredLitUI.SynchronizeLayerProperties
         _TexWorldScale0("Tiling", Float) = 1.0
         _TexWorldScale1("Tiling", Float) = 1.0
         _TexWorldScale2("Tiling", Float) = 1.0

Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader

         _HeightOffset2("_HeightOffset2", Range(-0.3, 0.3)) = 0.0
         _HeightOffset3("_HeightOffset3", Range(-0.3, 0.3)) = 0.0
 
-        _HeightFactor1("_HeightFactor1", Range(0, 5)) = 1
-        _HeightFactor2("_HeightFactor2", Range(0, 5)) = 1
-        _HeightFactor3("_HeightFactor3", Range(0, 5)) = 1
+        _HeightFactor1("_HeightFactor1", Float) = 1
+        _HeightFactor2("_HeightFactor2", Float) = 1
+        _HeightFactor3("_HeightFactor3", Float) = 1
 
         _BlendSize1("_BlendSize1", Range(0, 0.30)) = 0.0
         _BlendSize2("_BlendSize2", Range(0, 0.30)) = 0.0
 
         _VertexColorHeightFactor("_VertexColorHeightFactor", Float) = 0.3
 
+        // Layer blending options V2
+        [ToggleOff] _UseHeightBasedBlendV2("Use Height Blend V2", Float) = 0.0
+
+        _HeightCenterOffset1("_HeightCenterOffset1", Float) = 0.0
+        _HeightCenterOffset2("_HeightCenterOffset2", Float) = 0.0
+        _HeightCenterOffset3("_HeightCenterOffset3", Float) = 0.0
+
+        _BlendUsingHeight1("_BlendUsingHeight1", Float) = 0.0
+        _BlendUsingHeight2("_BlendUsingHeight2", Float) = 0.0
+        _BlendUsingHeight3("_BlendUsingHeight3", Float) = 0.0
+
+        _InheritBaseNormal1("_InheritBaseNormal1", Range(0, 1.0)) = 0.0
+        _InheritBaseNormal2("_InheritBaseNormal2", Range(0, 1.0)) = 0.0
+        _InheritBaseNormal3("_InheritBaseNormal3", Range(0, 1.0)) = 0.0
+
+        _InheritBaseHeight1("_InheritBaseHeight1", Range(0, 1.0)) = 0.0
+        _InheritBaseHeight2("_InheritBaseHeight2", Range(0, 1.0)) = 0.0
+        _InheritBaseHeight3("_InheritBaseHeight3", Range(0, 1.0)) = 0.0
+
+        _InheritBaseColor1("_InheritBaseColor1", Range(0, 1.0)) = 0.0
+        _InheritBaseColor2("_InheritBaseColor2", Range(0, 1.0)) = 0.0
+        _InheritBaseColor3("_InheritBaseColor3", Range(0, 1.0)) = 0.0
+
+        _InheritBaseColorThreshold1("_InheritBaseColorThreshold1", Range(0, 1.0)) = 1.0
+        _InheritBaseColorThreshold2("_InheritBaseColorThreshold2", Range(0, 1.0)) = 1.0
+        _InheritBaseColorThreshold3("_InheritBaseColorThreshold3", Range(0, 1.0)) = 1.0
+
+        _MinimumOpacity1("_MinimumOpacity1", Range(0, 1.0)) = 1.0
+        _MinimumOpacity2("_MinimumOpacity2", Range(0, 1.0)) = 1.0
+        _MinimumOpacity3("_MinimumOpacity3", Range(0, 1.0)) = 1.0
+
+        _OpacityAsDensity1("_OpacityAsDensity1", Range(0, 1.0)) = 0.0
+        _OpacityAsDensity2("_OpacityAsDensity2", Range(0, 1.0)) = 0.0
+        _OpacityAsDensity3("_OpacityAsDensity3", Range(0, 1.0)) = 0.0
+
         _DistortionVectorMap("DistortionVectorMap", 2D) = "black" {}
 
         _EmissiveColor("EmissiveColor", Color) = (0, 0, 0)
 
         [HideInInspector] _LayerCount("_LayerCount", Float) = 2.0
 
-		// WARNING
-		// All the following properties that concern the UV mapping are the same as in the Lit shader.
-		// This means that they will get overridden when synchronizing the various layers.
-		// To avoid this, make sure that all properties here are in the exclusion list in LayeredLitUI.SynchronizeLayerProperties
+        // WARNING
+        // All the following properties that concern the UV mapping are the same as in the Lit shader.
+        // This means that they will get overridden when synchronizing the various layers.
+        // To avoid this, make sure that all properties here are in the exclusion list in LayeredLitUI.SynchronizeLayerProperties
         _TexWorldScale0("Tiling", Float) = 1.0
         _TexWorldScale1("Tiling", Float) = 1.0
         _TexWorldScale2("Tiling", Float) = 1.0
 
     HLSLINCLUDE
 
-    #pragma target 4.5
-    #pragma only_renderers d3d11 ps4 metal // TEMP: unitl we go futher in dev
+    #pragma target 5.0
+    #pragma only_renderers d3d11 ps4 // TEMP: unitl we go futher in dev
 
     #pragma shader_feature _ALPHATEST_ON
     #pragma shader_feature _DISTORTION_ON
     #pragma shader_feature _DETAIL_MAP
     #pragma shader_feature _ _LAYER_MASK_VERTEX_COLOR_MUL _LAYER_MASK_VERTEX_COLOR_ADD
     #pragma shader_feature _HEIGHT_BASED_BLEND
+    #pragma shader_feature _HEIGHT_BASED_BLEND_V2
     #pragma shader_feature _ _LAYEREDLIT_3_LAYERS _LAYEREDLIT_4_LAYERS
 
     #pragma multi_compile LIGHTMAP_OFF LIGHTMAP_ON
     #endif
 
     // Explicitely said that we are a layered shader as we share code between lit and layered lit
-    #define LAYERED_LIT_SHADER    
+    #define LAYERED_LIT_SHADER
 
     //-------------------------------------------------------------------------------------
     // variable declaration
         }
     }
 
-	CustomEditor "Experimental.Rendering.HDPipeline.LayeredLitGUI"
+    CustomEditor "Experimental.Rendering.HDPipeline.LayeredLitGUI"
 }

Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitData.hlsl

 #endif
 }
 
-float3 ComputeInheritedNormalTS(float3 normalTS0, float3 normalTS1, float3 normalTS2, float3 normalTS3, LayerTexCoord layerTexCoord, float weights[_MAX_LAYER])
+float3 ComputeInheritedNormalTS(FragInputs input, float3 normalTS0, float3 normalTS1, float3 normalTS2, float3 normalTS3, LayerTexCoord layerTexCoord, float weights[_MAX_LAYER])
 {
     float3 normalTS;
 //#if !defined(_HEIGHT_BASED_BLEND_V2)
     float inheritBaseNormal = BlendLayeredScalar(1.0f, _InheritBaseNormal1, _InheritBaseNormal2, _InheritBaseNormal3, weights);
     // Based on this inheritance parameters, fetch a lower level of the base layer normal map so that the less we inherit the more this tends to be "vertex normal"
     float maxMipBias = 12.0f; // We arbitrarly choose the max bias for a 2048 texture. Smaller texture will bias toward vertex normal faster.
-    float3 inheritedBaseNormalTS = GetNormalTS0(layerTexCoord, float3(0.0, 0.0, 0.0), 0.0f, true, maxMipBias * (1.0 - inheritBaseNormal));
+    float3 inheritedBaseNormalTS = GetNormalTS0(input, layerTexCoord, float3(0.0, 0.0, 0.0), 0.0f, true, maxMipBias * (1.0 - inheritBaseNormal));
 
     // Blend all layers but the base one. This will then be added to the "inherited" normal of base layer (that's why base layer here is tangent space vertex normal so that if it's the visible layer we add nothing in term of normal map).
     float3 layersNormalTS = BlendLayeredFloat3(float3(0.0, 0.0, 1.0), normalTS1, normalTS2, normalTS3, weights);
 
     float3 normalTS;
 #if defined(_HEIGHT_BASED_BLEND)
-    normalTS = ComputeInheritedNormalTS(normalTS0, normalTS1, normalTS2, normalTS3, layerTexCoord, weights);
+    normalTS = ComputeInheritedNormalTS(input, normalTS0, normalTS1, normalTS2, normalTS3, layerTexCoord, weights);
 #else
     normalTS = BlendLayeredFloat3(normalTS0, normalTS1, normalTS2, normalTS3, weights);
 #endif

Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitTessellation.shader

 
             ENDHLSL
         }
-        
+
         Pass
         {
             Name "ShadowCaster"
 
             ENDHLSL
         }
-        
+
         Pass
         {
             Name "Motion Vectors"
 
             ENDHLSL
         }
-   
+
         Pass
         {
             Name "Distortion" // Name is not used