push draft

ScriptableRenderPipeline/Core/ShaderLibrary/Common.hlsl

     return  saturate(x * FLT_MAX) * 2.0 - 1.0;
 }
 
+// Orthonormalize the basis vectors using the Gram-Schmidt process.
+// We assume that the length of the surface normal is sufficiently close to 1.
+float3 Orthonormalize(float3 tangentWS, float3 normalWS)
+{
+    return normalize(tangentWS - dot(tangentWS, normalWS) * normalWS);
+}
+
 // ----------------------------------------------------------------------------
 // Texture utilities
 // ----------------------------------------------------------------------------

ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader

         _MaskMap2("MaskMap2", 2D) = "white" {}
         _MaskMap3("MaskMap3", 2D) = "white" {}
 
-        _SpecularOcclusionMap0("SpecularOcclusion0", 2D) = "white" {}
-        _SpecularOcclusionMap1("SpecularOcclusion1", 2D) = "white" {}
-        _SpecularOcclusionMap2("SpecularOcclusion2", 2D) = "white" {}
-        _SpecularOcclusionMap3("SpecularOcclusion3", 2D) = "white" {}
-
         _NormalMap0("NormalMap0", 2D) = "bump" {}
         _NormalMap1("NormalMap1", 2D) = "bump" {}
         _NormalMap2("NormalMap2", 2D) = "bump" {}
         _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" {}
 
         _HeightMap0("HeightMap0", 2D) = "black" {}
         _HeightMap1("HeightMap1", 2D) = "black" {}
     #pragma shader_feature _MASKMAP1
     #pragma shader_feature _MASKMAP2
     #pragma shader_feature _MASKMAP3
-    #pragma shader_feature _SPECULAROCCLUSIONMAP0
-    #pragma shader_feature _SPECULAROCCLUSIONMAP1
-    #pragma shader_feature _SPECULAROCCLUSIONMAP2
-    #pragma shader_feature _SPECULAROCCLUSIONMAP3
+    #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 _HEIGHTMAP0
     #pragma shader_feature _HEIGHTMAP1

ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader

         _MaskMap2("MaskMap2", 2D) = "white" {}
         _MaskMap3("MaskMap3", 2D) = "white" {}
 
-        _SpecularOcclusionMap0("SpecularOcclusion0", 2D) = "white" {}
-        _SpecularOcclusionMap1("SpecularOcclusion1", 2D) = "white" {}
-        _SpecularOcclusionMap2("SpecularOcclusion2", 2D) = "white" {}
-        _SpecularOcclusionMap3("SpecularOcclusion3", 2D) = "white" {}
-
         _NormalMap0("NormalMap0", 2D) = "bump" {}
         _NormalMap1("NormalMap1", 2D) = "bump" {}
         _NormalMap2("NormalMap2", 2D) = "bump" {}
         _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" {}
 
         _HeightMap0("HeightMap0", 2D) = "black" {}
         _HeightMap1("HeightMap1", 2D) = "black" {}
     #pragma shader_feature _MASKMAP1
     #pragma shader_feature _MASKMAP2
     #pragma shader_feature _MASKMAP3
-    #pragma shader_feature _SPECULAROCCLUSIONMAP0
-    #pragma shader_feature _SPECULAROCCLUSIONMAP1
-    #pragma shader_feature _SPECULAROCCLUSIONMAP2
-    #pragma shader_feature _SPECULAROCCLUSIONMAP3
+    #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 _HEIGHTMAP0
     #pragma shader_feature _HEIGHTMAP1

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader

         _Smoothness("Smoothness", Range(0.0, 1.0)) = 1.0
         _MaskMap("MaskMap", 2D) = "white" {}
 
-        _SpecularOcclusionMap("SpecularOcclusion", 2D) = "white" {}
-
+
+        _BentNormalMap("_BentNormalMap", 2D) = "bump" {}
+        _BentNormalMapOS("_BentNormalMapOS", 2D) = "white" {}
 
         _HeightMap("HeightMap", 2D) = "black" {}
         _HeightAmplitude("Height Amplitude", Float) = 0.01 // In world units
 
     #pragma shader_feature _NORMALMAP
     #pragma shader_feature _MASKMAP
-    #pragma shader_feature _SPECULAROCCLUSIONMAP
+    #pragma shader_feature _BENTNORMALMAP
     #pragma shader_feature _EMISSIVE_COLOR_MAP
     #pragma shader_feature _HEIGHTMAP
     #pragma shader_feature _TANGENTMAP

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl

 #define SAMPLER_NORMALMAP_IDX sampler_NormalMapOS
 #endif
 
+#ifdef _NORMALMAP_TANGENT_SPACE
+#define SAMPLER_BENTNORMALMAP_IDX sampler_BentNormalMap
+#else
+#define SAMPLER_BENTNORMALMAP_IDX sampler_BentNormalMapOS
+#endif
+
-#define SAMPLER_SPECULAROCCLUSIONMAP_IDX sampler_SpecularOcclusionMap
 #define SAMPLER_HEIGHTMAP_IDX sampler_HeightMap
 
 // include LitDataInternal to define GetSurfaceData
 #ifdef _MASKMAP
 #define _MASKMAP_IDX
 #endif
-#ifdef _SPECULAROCCLUSIONMAP
-#define _SPECULAROCCLUSIONMAP_IDX
+#ifdef _BENTNORMALMAP
+#define _BENTNORMALMAP_IDX
 #endif
 #include "LitDataInternal.hlsl"
 
     ZERO_INITIALIZE(LayerTexCoord, layerTexCoord);
     GetLayerTexCoord(input, layerTexCoord);
 
-
     float depthOffset = ApplyPerPixelDisplacement(input, V, layerTexCoord);
 
 #ifdef _DEPTHOFFSET_ON
     // 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;
-    float alpha = GetSurfaceData(input, layerTexCoord, surfaceData, normalTS);
-    GetNormalAndTangentWS(input, V, normalTS, surfaceData.normalWS, surfaceData.tangentWS);
+    float alpha = GetSurfaceData(input, layerTexCoord, surfaceData, normalTS, bentNormalTS);
+    GetNormalWS(input, V, normalTS, surfaceData.normalWS);
+    // This is use with anisotropic material
+    Orthonormalize(surfaceData.tangentWS, surfaceData.normalWS);
     // Done one time for all layered - cumulate with spec occ alpha for now
     surfaceData.specularOcclusion *= GetHorizonOcclusion(V, surfaceData.normalWS, interpolatedVertexNormal, _HorizonFade);
 
     #endif
 #endif
 
+#if defined(_BENTNORMALMAP0)
+    #if defined(_NORMALMAP_TANGENT_SPACE0)
+    #define SAMPLER_BENTNORMALMAP_IDX sampler_BentNormalMap0
+    #else
+    #define SAMPLER_BENTNORMALMAP_IDX sampler_BentNormalMapOS0
+    #endif
+#elif defined(_BENTNORMALMAP1)
+    #if defined(_NORMALMAP_TANGENT_SPACE1)
+    #define SAMPLER_BENTNORMALMAP_IDX sampler_BentNormalMap1
+    #else
+    #define SAMPLER_BENTNORMALMAP_IDX sampler_BentNormalMapOS1
+    #endif
+#elif defined(_BENTNORMALMAP2)
+    #if defined(_NORMALMAP_TANGENT_SPACE2)
+    #define SAMPLER_BENTNORMALMAP_IDX sampler_BentNormalMap2
+    #else
+    #define SAMPLER_BENTNORMALMAP_IDX sampler_BentNormalMapOS2
+    #endif
+#else
+    #if defined(_NORMALMAP_TANGENT_SPACE3)
+    #define SAMPLER_BENTNORMALMAP_IDX sampler_BentNormalMap3
+    #else
+    #define SAMPLER_BENTNORMALMAP_IDX sampler_BentNormalMapOS3
+    #endif
+#endif
+
 #if defined(_DETAIL_MAP0)
 #define SAMPLER_DETAILMASK_IDX sampler_DetailMask0
 #define SAMPLER_DETAILMAP_IDX sampler_DetailMap0
 #define SAMPLER_MASKMAP_IDX sampler_MaskMap3
 #endif
 
-#if defined(_SPECULAROCCLUSIONMAP0)
-#define SAMPLER_SPECULAROCCLUSIONMAP_IDX sampler_SpecularOcclusionMap0
-#elif defined(_SPECULAROCCLUSIONMAP1)
-#define SAMPLER_SPECULAROCCLUSIONMAP_IDX sampler_SpecularOcclusionMap1
-#elif defined(_SPECULAROCCLUSIONMAP2)
-#define SAMPLER_SPECULAROCCLUSIONMAP_IDX sampler_SpecularOcclusionMap2
-#else
-#define SAMPLER_SPECULAROCCLUSIONMAP_IDX sampler_SpecularOcclusionMap3
-#endif
-
 #if defined(_HEIGHTMAP0)
 #define SAMPLER_HEIGHTMAP_IDX sampler_HeightMap0
 #elif defined(_HEIGHTMAP1)
 #ifdef _MASKMAP0
 #define _MASKMAP_IDX
 #endif
-#ifdef _SPECULAROCCLUSIONMAP0
-#define _SPECULAROCCLUSIONMAP_IDX
+#ifdef _BENTNORMALMAP0
+#define _BENTNORMALMAP_IDX
 #endif
 #include "LitDataInternal.hlsl"
 #undef LAYER_INDEX
 #undef _DETAIL_MAP_IDX
 #undef _MASKMAP_IDX
-#undef _SPECULAROCCLUSIONMAP_IDX
+#undef _BENTNORMALMAP_IDX
 
 #define LAYER_INDEX 1
 #define ADD_IDX(Name) Name##1
 #ifdef _MASKMAP1
 #define _MASKMAP_IDX
 #endif
-#ifdef _SPECULAROCCLUSIONMAP1
-#define _SPECULAROCCLUSIONMAP_IDX
+#ifdef _BENTNORMALMAP1
+#define _BENTNORMALMAP_IDX
 #endif
 #include "LitDataInternal.hlsl"
 #undef LAYER_INDEX
 #undef _DETAIL_MAP_IDX
 #undef _MASKMAP_IDX
-#undef _SPECULAROCCLUSIONMAP_IDX
+#undef _BENTNORMALMAP_IDX
 
 #define LAYER_INDEX 2
 #define ADD_IDX(Name) Name##2
 #ifdef _MASKMAP2
 #define _MASKMAP_IDX
 #endif
-#ifdef _SPECULAROCCLUSIONMAP2
-#define _SPECULAROCCLUSIONMAP_IDX
+#ifdef _BENTNORMALMAP2
+#define _BENTNORMALMAP_IDX
 #endif
 #include "LitDataInternal.hlsl"
 #undef LAYER_INDEX
 #undef _DETAIL_MAP_IDX
 #undef _MASKMAP_IDX
-#undef _SPECULAROCCLUSIONMAP_IDX
+#undef _BENTNORMALMAP_IDX
 
 #define LAYER_INDEX 3
 #define ADD_IDX(Name) Name##3
 #ifdef _MASKMAP3
 #define _MASKMAP_IDX
 #endif
-#ifdef _SPECULAROCCLUSIONMAP3
-#define _SPECULAROCCLUSIONMAP_IDX
+#ifdef _BENTNORMALMAP3
+#define _BENTNORMALMAP_IDX
 #endif
 #include "LitDataInternal.hlsl"
 #undef LAYER_INDEX
 #undef _DETAIL_MAP_IDX
 #undef _MASKMAP_IDX
-#undef _SPECULAROCCLUSIONMAP_IDX
+#undef _BENTNORMALMAP_IDX
 
 float3 BlendLayeredVector3(float3 x0, float3 x1, float3 x2, float3 x3, float weight[4])
 {
     surfaceData.coatCoverage = 0.0f;
     surfaceData.coatIOR = 0.5;
 
-    GetNormalAndTangentWS(input, V, normalTS, surfaceData.normalWS, surfaceData.tangentWS);
+    GetNormalWS(input, V, normalTS, surfaceData.normalWS);
+
     // Done one time for all layered - cumulate with spec occ alpha for now
     surfaceData.specularOcclusion = SURFACEDATA_BLEND_SCALAR(surfaceData, specularOcclusion, weights);
     surfaceData.specularOcclusion *= GetHorizonOcclusion(V, surfaceData.normalWS, input.worldToTangent[2].xyz, _HorizonFade);

ScriptableRenderPipeline/HDRenderPipeline/Material/MaterialUtilities.hlsl

 }
 
 // This function convert the tangent space normal/tangent to world space and orthonormalize it + apply a correction of the normal if it is not pointing towards the near plane
-void GetNormalAndTangentWS(FragInputs input, float3 V, float3 normalTS, inout float3 normalWS, inout float3 tangentWS)
+void GetNormalWS(FragInputs input, float3 V, float3 normalTS, out float3 normalWS)
 {
     #ifdef SURFACE_GRADIENT
     normalWS = SurfaceGradientResolveNormal(input.worldToTangent[2], normalTS);
     #endif
-
-    // Orthonormalize the basis vectors using the Gram-Schmidt process.
-    // We assume that the length of the surface normal is sufficiently close to 1.
-    // This is use with anisotropic material
-    tangentWS = normalize(tangentWS - dot(tangentWS, normalWS) * normalWS);
 }