Added normal map support. Need engine changes so that _NORMALMAP0-_NORMALMAP3 keywords can be selected.

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/LayeredLit/TerrainLitUI.cs

 
             for (int i = 0; i < kMaxLayerCount; ++i)
             {
-                NormalMapSpace normalMapSpace = ((NormalMapSpace)material.GetFloat(kNormalMapSpace + i));
-
-                CoreUtils.SetKeyword(material, "_NORMALMAP_TANGENT_SPACE" + i, normalMapSpace == NormalMapSpace.TangentSpace);
-
-                if (normalMapSpace == NormalMapSpace.TangentSpace)
-                {
-                    CoreUtils.SetKeyword(material, "_NORMALMAP" + i, material.GetTexture(kNormalMap + i) || material.GetTexture(kDetailMap + i));
-                    CoreUtils.SetKeyword(material, "_BENTNORMALMAP" + i, material.GetTexture(kBentNormalMap + i));
-                }
-                else
-                {
-                    CoreUtils.SetKeyword(material, "_NORMALMAP" + i, material.GetTexture(kNormalMapOS + i) || material.GetTexture(kDetailMap + i));
-                    CoreUtils.SetKeyword(material, "_BENTNORMALMAP" + i, material.GetTexture(kBentNormalMapOS + i));
-                }
+                CoreUtils.SetKeyword(material, "_NORMALMAP" + i, material.GetTexture(kNormalMap + i) || material.GetTexture(kDetailMap + i));
 
                 CoreUtils.SetKeyword(material, "_MASKMAP" + i, material.GetTexture(kMaskMap + i));
 

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/TerrainLit.shader

         [HideInInspector] _Splat2("Layer 2", 2D) = "white" {}
         [HideInInspector] _Splat3("Layer 3", 2D) = "white" {}
 
+        [HideInInspector] _Normal0("Normal 0", 2D) = "bump" {}
+        [HideInInspector] _Normal1("Normal 1", 2D) = "bump" {}
+        [HideInInspector] _Normal2("Normal 2", 2D) = "bump" {}
+        [HideInInspector] _Normal3("Normal 3", 2D) = "bump" {}
+
         // Since we don't use a mask texture for getting the mask, we'll need the metallic property to be serialized as in sRGB space.
         [HideInInspector] [Gamma] _Metallic0("Metallic 0", Range(0.0, 1.0)) = 0
         [HideInInspector] [Gamma] _Metallic1("Metallic 1", Range(0.0, 1.0)) = 0
         _MaskMap2("MaskMap2", 2D) = "white" {}
         _MaskMap3("MaskMap3", 2D) = "white" {}
 
-        _NormalMap0("NormalMap0", 2D) = "bump" {}
-        _NormalMap1("NormalMap1", 2D) = "bump" {}
-        _NormalMap2("NormalMap2", 2D) = "bump" {}
-        _NormalMap3("NormalMap3", 2D) = "bump" {}
-
-        _NormalMapOS0("NormalMapOS0", 2D) = "white" {}
-        _NormalMapOS1("NormalMapOS1", 2D) = "white" {}
-        _NormalMapOS2("NormalMapOS2", 2D) = "white" {}
-        _NormalMapOS3("NormalMapOS3", 2D) = "white" {}
-
-        _NormalScale0("_NormalScale0", Range(0.0, 2.0)) = 1
-        _NormalScale1("_NormalScale1", Range(0.0, 2.0)) = 1
-        _NormalScale2("_NormalScale2", Range(0.0, 2.0)) = 1
-        _NormalScale3("_NormalScale3", Range(0.0, 2.0)) = 1
-
-        _BentNormalMap0("BentNormalMap0", 2D) = "bump" {}
-        _BentNormalMap1("BentNormalMap1", 2D) = "bump" {}
-        _BentNormalMap2("BentNormalMap2", 2D) = "bump" {}
-        _BentNormalMap3("BentNormalMap3", 2D) = "bump" {}
-
-        _BentNormalMapOS0("BentNormalMapOS0", 2D) = "white" {}
-        _BentNormalMapOS1("BentNormalMapOS1", 2D) = "white" {}
-        _BentNormalMapOS2("BentNormalMapOS2", 2D) = "white" {}
-        _BentNormalMapOS3("BentNormalMapOS3", 2D) = "white" {}
-
-        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace0("NormalMap space", Float) = 0
-        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace1("NormalMap space", Float) = 0
-        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace2("NormalMap space", Float) = 0
-        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace3("NormalMap space", Float) = 0
-
         _DiffusionProfile0("Diffusion Profile0", Int) = 0
         _DiffusionProfile1("Diffusion Profile1", Int) = 0
         _DiffusionProfile2("Diffusion Profile2", Int) = 0
     //#pragma shader_feature _ _LAYER_MAPPING_PLANAR1 _LAYER_MAPPING_TRIPLANAR1
     //#pragma shader_feature _ _LAYER_MAPPING_PLANAR2 _LAYER_MAPPING_TRIPLANAR2
     //#pragma shader_feature _ _LAYER_MAPPING_PLANAR3 _LAYER_MAPPING_TRIPLANAR3
-    #pragma shader_feature _NORMALMAP_TANGENT_SPACE0
-    #pragma shader_feature _NORMALMAP_TANGENT_SPACE1
-    #pragma shader_feature _NORMALMAP_TANGENT_SPACE2
-    #pragma shader_feature _NORMALMAP_TANGENT_SPACE3
 
     #pragma shader_feature _NORMALMAP0
     #pragma shader_feature _NORMALMAP1
     #pragma shader_feature _MASKMAP1
     #pragma shader_feature _MASKMAP2
     #pragma shader_feature _MASKMAP3
-    #pragma shader_feature _BENTNORMALMAP0
-    #pragma shader_feature _BENTNORMALMAP1
-    #pragma shader_feature _BENTNORMALMAP2
-    #pragma shader_feature _BENTNORMALMAP3
     #pragma shader_feature _EMISSIVE_COLOR_MAP
     #pragma shader_feature _ENABLESPECULAROCCLUSION
     #pragma shader_feature _HEIGHTMAP0

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/TerrainLitData.hlsl

 #define LAYERS_HEIGHTMAP_ENABLE (defined(_HEIGHTMAP0) || defined(_HEIGHTMAP1) || (_LAYER_COUNT > 2 && defined(_HEIGHTMAP2)) || (_LAYER_COUNT > 3 && defined(_HEIGHTMAP3)))
 
 TEXTURE2D(_Splat0);
+TEXTURE2D(_Normal0);
+TEXTURE2D(_Normal1);
+TEXTURE2D(_Normal2);
+TEXTURE2D(_Normal3);
 float4 _Splat3_ST;
 SAMPLER(sampler_Splat0);
 
 #define _BaseColor3 float4(1,1,1,1)
+#define _NormalScale0 1
+#define _NormalScale1 1
+#define _NormalScale2 1
+#define _NormalScale3 1
-#if defined(_NORMALMAP0)
-    #if defined(_NORMALMAP_TANGENT_SPACE0)
-    #define SAMPLER_NORMALMAP_IDX sampler_NormalMap0
-    #else
-    #define SAMPLER_NORMALMAP_IDX sampler_NormalMapOS0
-    #endif
-#elif defined(_NORMALMAP1)
-    #if defined(_NORMALMAP_TANGENT_SPACE1)
-    #define SAMPLER_NORMALMAP_IDX sampler_NormalMap1
-    #else
-    #define SAMPLER_NORMALMAP_IDX sampler_NormalMapOS1
-    #endif
-#elif defined(_NORMALMAP2)
-    #if defined(_NORMALMAP_TANGENT_SPACE2)
-    #define SAMPLER_NORMALMAP_IDX sampler_NormalMap2
-    #else
-    #define SAMPLER_NORMALMAP_IDX sampler_NormalMapOS2
-    #endif
-#elif defined(_NORMALMAP3)
-    #if defined(_NORMALMAP_TANGENT_SPACE3)
-    #define SAMPLER_NORMALMAP_IDX sampler_NormalMap3
-    #else
-    #define SAMPLER_NORMALMAP_IDX sampler_NormalMapOS3
-    #endif
-#elif defined(_BENTNORMALMAP0)
-    #if defined(_NORMALMAP_TANGENT_SPACE0)
-    #define SAMPLER_NORMALMAP_IDX sampler_BentNormalMap0
-    #else
-    #define SAMPLER_NORMALMAP_IDX sampler_BentNormalMapOS0
-    #endif
-#elif defined(_BENTNORMALMAP1)
-    #if defined(_NORMALMAP_TANGENT_SPACE1)
-    #define SAMPLER_NORMALMAP_IDX sampler_BentNormalMap1
-    #else
-    #define SAMPLER_NORMALMAP_IDX sampler_BentNormalMapOS1
-    #endif
-#elif defined(_BENTNORMALMAP2)
-    #if defined(_NORMALMAP_TANGENT_SPACE2)
-    #define SAMPLER_NORMALMAP_IDX sampler_BentNormalMap2
-    #else
-    #define SAMPLER_NORMALMAP_IDX sampler_BentNormalMapOS2
-    #endif
-#else
-    #if defined(_NORMALMAP_TANGENT_SPACE3)
-    #define SAMPLER_NORMALMAP_IDX sampler_BentNormalMap3
-    #else
-    #define SAMPLER_NORMALMAP_IDX sampler_BentNormalMapOS3
-    #endif
-#endif
+#define SAMPLER_NORMALMAP_IDX sampler_Splat0
 
 #if defined(_MASKMAP0)
 #define SAMPLER_MASKMAP_IDX sampler_MaskMap0
 #define ADD_ZERO_IDX(Name) Name##0
 #define _BaseColorMap _Splat
 #define sampler_BaseColorMap sampler_Splat
+#define _NormalMap _Normal
+#define _NORMALMAP_TANGENT_SPACE_IDX
 
 // include LitDataInternal multiple time to define the variation of GetSurfaceData for each layer
 #define LAYER_INDEX 0
 #endif
-#ifdef _NORMALMAP_TANGENT_SPACE0
-#define _NORMALMAP_TANGENT_SPACE_IDX
-#endif
-#ifdef _BENTNORMALMAP0
-#define _BENTNORMALMAP_IDX
-#endif
-#undef _NORMALMAP_TANGENT_SPACE_IDX
-#undef _BENTNORMALMAP_IDX
 
 #define LAYER_INDEX 1
 #define ADD_IDX(Name) Name##1
-#ifdef _NORMALMAP_TANGENT_SPACE1
-#define _NORMALMAP_TANGENT_SPACE_IDX
-#endif
-#ifdef _BENTNORMALMAP1
-#define _BENTNORMALMAP_IDX
-#endif
-#undef _NORMALMAP_TANGENT_SPACE_IDX
-#undef _BENTNORMALMAP_IDX
-#endif
-#ifdef _NORMALMAP_TANGENT_SPACE2
-#define _NORMALMAP_TANGENT_SPACE_IDX
-#ifdef _BENTNORMALMAP2
-#define _BENTNORMALMAP_IDX
-#endif
-#undef _NORMALMAP_TANGENT_SPACE_IDX
-#undef _BENTNORMALMAP_IDX
 
 #define LAYER_INDEX 3
 #define ADD_IDX(Name) Name##3
-#ifdef _NORMALMAP_TANGENT_SPACE3
-#define _NORMALMAP_TANGENT_SPACE_IDX
-#endif
-#ifdef _BENTNORMALMAP3
-#define _BENTNORMALMAP_IDX
-#endif
-#undef _NORMALMAP_TANGENT_SPACE_IDX
-#undef _BENTNORMALMAP_IDX
+#undef ADD_ZERO_IDX
+#undef _BaseColorMap
+#undef sampler_BaseColorMap
+#undef _NormalMap
+#undef _NORMALMAP_TANGENT_SPACE_IDX
 
 float3 BlendLayeredVector3(float3 x0, float3 x1, float3 x2, float3 x3, float weight[4])
 {