HDRenderLoop: fix shadow code

8 年前 · 115b193a
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
                {
                    ShadowOutput shadows;
                    m_ShadowPass.Render(renderLoop, cullResults, out shadows);
+
+                    renderLoop.SetupCameraProperties(camera); // Need to recall SetupCameraProperties after m_ShadowPass.Render
+
                    UpdatePunctualLights(cullResults.visibleLights, ref shadows);
                    UpdateReflectionProbes(cullResults.visibleReflectionProbes);

--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Lighting/SinglePass/SinglePass.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Lighting/SinglePass/SinglePass.hlsl

 PunctualShadowData GetPunctualShadowData(LightLoopContext lightLoopContext, int index, float3 L)
 {
-    int faceIndex;
+    int faceIndex = 0;
    if (_PunctualShadowList[index].shadowType == SHADOWTYPE_POINT)
    {
        GetCubeFaceID(L, faceIndex);
 {
   // if (lightLoopContext.sampleShadow == SINGLE_PASS_CONTEXT_SAMPLE_SHADOWATLAS)
    {
+        float objDepth = saturate(257.0 / 256.0 - texCoord.z);
+
-        return SAMPLE_TEXTURE2D_SHADOW(g_tShadowBuffer, samplerg_tShadowBuffer, texCoord).xxxx;
+        return SAMPLE_TEXTURE2D_SHADOW(g_tShadowBuffer, samplerg_tShadowBuffer, float3(texCoord.xy, objDepth)).xxxx;
    }
    /*
    else // SINGLE_PASS_CONTEXT_SAMPLE_SHADOWARRAY
--- a/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit/LitDefault.shader
+++ b/Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit/LitDefault.shader
            #include "../../Material/Material.hlsl"            
            #include "LitData.hlsl"

+            #define NEED_TANGENT_TO_WORLD (defined(_HEIGHTMAP) && !defined (_HEIGHTMAP_AS_DISPLACEMENT))
+            #define NEED_TEXCOORD0 defined(_ALPHATEST_ON) || NEED_TANGENT_TO_WORLD
+
+                #if NEED_TEXCOORD0
-                #if defined(_HEIGHTMAP) && !defined (_HEIGHTMAP_AS_DISPLACEMENT)
+                #endif
+                #if NEED_TANGENT_TO_WORLD
                float4 tangentOS : TANGENT;
                #endif
            };
                float4 positionHS;
+                #if NEED_TEXCOORD0
-                #if defined(_HEIGHTMAP) && !defined (_HEIGHTMAP_AS_DISPLACEMENT)
+                #endif
+                #if NEED_TANGENT_TO_WORLD
                float3 positionWS;                
                float3 tangentToWorld[3];
                #endif
            {
                float4 positionHS : SV_Position;
-                #if defined(_HEIGHTMAP) && !defined (_HEIGHTMAP_AS_DISPLACEMENT)
+                #if NEED_TANGENT_TO_WORLD
-                #else
+                #elif NEED_TEXCOORD0
                float4 interpolators[1] : TEXCOORD0;
                #endif
            };
            {
                PackedVaryings output;
                output.positionHS = input.positionHS;
-                #if defined(_HEIGHTMAP) && !defined (_HEIGHTMAP_AS_DISPLACEMENT)
+                #if NEED_TANGENT_TO_WORLD
                output.interpolators[0].xyz = input.positionWS.xyz;
                output.interpolators[1].xyz = input.tangentToWorld[0];
                output.interpolators[2].xyz = input.tangentToWorld[1];
                output.interpolators[1].w = input.texCoord0.y;                
-                #else
+                #elif NEED_TEXCOORD0
                output.interpolators[0] = float4(input.texCoord0, 0.0, 0.0);
                #endif

                ZERO_INITIALIZE(FragInput, output);

                output.positionHS = input.positionHS;
-                #if defined(_HEIGHTMAP) && !defined (_HEIGHTMAP_AS_DISPLACEMENT)
+                #if NEED_TANGENT_TO_WORLD
                output.positionWS.xyz = input.interpolators[0].xyz;
                output.tangentToWorld[0] = input.interpolators[1].xyz;
                output.tangentToWorld[1] = input.interpolators[2].xyz;
-                #else
+                #elif NEED_TEXCOORD0
                output.texCoord0.xy = input.interpolators[0].xy;
                #endif

                float3 positionWS = TransformObjectToWorld(input.positionOS);
                output.positionHS = TransformWorldToHClip(positionWS);                

+                #if NEED_TEXCOORD0
+                #endif
-                #if defined(_HEIGHTMAP) && !defined (_HEIGHTMAP_AS_DISPLACEMENT)
+                #if NEED_TANGENT_TO_WORLD
                output.positionWS = positionWS;

                float3 normalWS = TransformObjectToWorldNormal(input.normalOS);
--- a/Assets/TestScenes/HDTest/HDRenderLoopTest.unity
+++ b/Assets/TestScenes/HDTest/HDRenderLoopTest.unity
  m_EditorClassIdentifier: 
  shadowResolution: 512
  innerSpotPercent: 49
+  shadowDimmer: 1
+  affectDiffuse: 1
+  affectSpecular: 1
 --- !u!108 &580932149
 Light:
  m_ObjectHideFlags: 0
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: e641a36bceddbf24a89656e94dafb3e5, type: 2}
  m_IsPrefabParent: 0
+--- !u!1 &733865593
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 733865594}
+  - component: {fileID: 733865595}
+  m_Layer: 0
+  m_Name: Spotlight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &733865594
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 733865593}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: -0.471, y: 7.317, z: 0.97}
+  m_LocalScale: {x: 0.5, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2070887976}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!108 &733865595
+Light:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 733865593}
+  m_Enabled: 1
+  serializedVersion: 7
+  m_Type: 0
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 8
+  m_Range: 13.18
+  m_SpotAngle: 79.1
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 1
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 4
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
 --- !u!1001 &744696321
 Prefab:
  m_ObjectHideFlags: 0
  m_EditorClassIdentifier: 
  shadowResolution: 512
  innerSpotPercent: 49
+  shadowDimmer: 1
+  affectDiffuse: 1
+  affectSpecular: 1
 --- !u!108 &970745599
 Light:
  m_ObjectHideFlags: 0
  m_StereoConvergence: 10
  m_StereoSeparation: 0.022
  m_StereoMirrorMode: 0
+--- !u!1 &2070887972
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 2070887976}
+  - component: {fileID: 2070887975}
+  - component: {fileID: 2070887974}
+  - component: {fileID: 2070887973}
+  m_Layer: 0
+  m_Name: Test - Spot light shadow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!23 &2070887973
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2070887972}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 9d65ced14251eb743ba9702a6f3c2ce8, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+--- !u!64 &2070887974
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2070887972}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Convex: 0
+  m_InflateMesh: 0
+  m_SkinWidth: 0.01
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &2070887975
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2070887972}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &2070887976
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2070887972}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -40.34, y: -0.99, z: -3.09}
+  m_LocalScale: {x: 2, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2082383796}
+  - {fileID: 733865594}
+  m_Father: {fileID: 0}
+  m_RootOrder: 22
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2082383795
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2070887976}
+    m_Modifications:
+    - target: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0.059999466
+      objectReference: {fileID: 0}
+    - target: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 2.33
+      objectReference: {fileID: 0}
+    - target: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 1.7599999
+      objectReference: {fileID: 0}
+    - target: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5, type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5, type: 2}
+      propertyPath: m_LocalScale.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 1faa212e4ad88f04a81c5ed019001de5, type: 2}
+  m_IsPrefabParent: 0
+--- !u!4 &2082383796 stripped
+Transform:
+  m_PrefabParentObject: {fileID: 4000010760374938, guid: 1faa212e4ad88f04a81c5ed019001de5,
+    type: 2}
+  m_PrefabInternal: {fileID: 2082383795}
 --- !u!1 &2102536477
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/TestScenes/HDTest/Leaf/GroundLeaf/Materials/GroundLeaf_Albedo.mat
+++ b/Assets/TestScenes/HDTest/Leaf/GroundLeaf/Materials/GroundLeaf_Albedo.mat
  m_CustomRenderQueue: -1
  stringTagMap: {}
  m_SavedProperties:
-    serializedVersion: 2
+    serializedVersion: 3
-    - first:
-        name: _BaseColorMap
-      second:
+    - _BaseColorMap:
-    - first:
-        name: _BumpMap
-      second:
+    - _BumpMap:
-    - first:
-        name: _DetailAlbedoMap
-      second:
+    - _DetailAlbedoMap:
-    - first:
-        name: _DetailMask
-      second:
+    - _DetailMask:
-    - first:
-        name: _DetailNormalMap
-      second:
+    - _DetailNormalMap:
-    - first:
-        name: _DiffuseLightingMap
-      second:
+    - _DiffuseLightingMap:
-    - first:
-        name: _EmissionMap
-      second:
+    - _EmissionMap:
-    - first:
-        name: _EmissiveColorMap
-      second:
+    - _EmissiveColorMap:
-    - first:
-        name: _HeightMap
-      second:
+    - _HeightMap:
-    - first:
-        name: _MainTex
-      second:
+    - _MainTex:
-    - first:
-        name: _MaskMap
-      second:
+    - _MaskMap:
-    - first:
-        name: _MetallicGlossMap
-      second:
+    - _MetallicGlossMap:
-    - first:
-        name: _NormalMap
-      second:
+    - _NormalMap:
-    - first:
-        name: _OcclusionMap
-      second:
+    - _OcclusionMap:
-    - first:
-        name: _ParallaxMap
-      second:
+    - _ParallaxMap:
-    - first:
-        name: _SpecularOcclusionMap
-      second:
+    - _SpecularOcclusionMap:
-    - first:
-        name: _SubSurfaceRadiusMap
-      second:
+    - _SubSurfaceRadiusMap:
-    - first:
-        name: _AlphaCutoff
-      second: 0.5
-    - first:
-        name: _AlphaCutoffEnable
-      second: 0
-    - first:
-        name: _BlendMode
-      second: 0
-    - first:
-        name: _BumpScale
-      second: 1
-    - first:
-        name: _CullMode
-      second: 0
-    - first:
-        name: _Cutoff
-      second: 0.5
-    - first:
-        name: _DetailNormalMapScale
-      second: 1
-    - first:
-        name: _DistortionDepthTest
-      second: 0
-    - first:
-        name: _DistortionOnly
-      second: 0
-    - first:
-        name: _DoubleSidedMode
-      second: 2
-    - first:
-        name: _DstBlend
-      second: 0
-    - first:
-        name: _EmissiveColorMode
-      second: 1
-    - first:
-        name: _EmissiveIntensity
-      second: 0
-    - first:
-        name: _GlossMapScale
-      second: 0.892
-    - first:
-        name: _Glossiness
-      second: 0.507
-    - first:
-        name: _GlossyReflections
-      second: 1
-    - first:
-        name: _HeightBias
-      second: 0
-    - first:
-        name: _HeightMapMode
-      second: 0
-    - first:
-        name: _HeightScale
-      second: 1
-    - first:
-        name: _MaterialId
-      second: 0
-    - first:
-        name: _Metalic
-      second: 0
-    - first:
-        name: _Metallic
-      second: 0
-    - first:
-        name: _Mettalic
-      second: 0
-    - first:
-        name: _Mode
-      second: 1
-    - first:
-        name: _NormalMapSpace
-      second: 0
-    - first:
-        name: _OcclusionStrength
-      second: 1
-    - first:
-        name: _Parallax
-      second: 0.02
-    - first:
-        name: _Smoothness
-      second: 0.5
-    - first:
-        name: _SmoothnessTextureChannel
-      second: 0
-    - first:
-        name: _SpecularHighlights
-      second: 1
-    - first:
-        name: _SrcBlend
-      second: 1
-    - first:
-        name: _SubSurfaceRadius
-      second: 0
-    - first:
-        name: _SurfaceType
-      second: 0
-    - first:
-        name: _UVSec
-      second: 0
-    - first:
-        name: _ZWrite
-      second: 1
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _BlendMode: 0
+    - _BumpScale: 1
+    - _CullMode: 0
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DistortionDepthTest: 0
+    - _DistortionOnly: 0
+    - _DoubleSidedMode: 2
+    - _DstBlend: 0
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _GlossMapScale: 0.892
+    - _Glossiness: 0.507
+    - _GlossyReflections: 1
+    - _HeightBias: 0
+    - _HeightMapMode: 0
+    - _HeightScale: 1
+    - _MaterialId: 0
+    - _Metalic: 0
+    - _Metallic: 0
+    - _Mettalic: 0
+    - _Mode: 1
+    - _NormalMapSpace: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SubSurfaceRadius: 0
+    - _SurfaceType: 0
+    - _UVSec: 0
+    - _ZWrite: 1
-    - first:
-        name: _BaseColor
-      second: {r: 1, g: 1, b: 1, a: 1}
-    - first:
-        name: _Color
-      second: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1}
-    - first:
-        name: _EmissionColor
-      second: {r: 0, g: 0, b: 0, a: 1}
-    - first:
-        name: _EmissiveColor
-      second: {r: 0, g: 0, b: 0, a: 1}
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/CubeTransparent.mat
+++ b/Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/CubeTransparent.mat
  stringTagMap:
    RenderType: Transparent
  m_SavedProperties:
-    serializedVersion: 2
+    serializedVersion: 3
-    - first:
-        name: _BaseColorMap
-      second:
+    - _BaseColorMap:
-    - first:
-        name: _BumpMap
-      second:
+    - _BumpMap:
-    - first:
-        name: _DetailAlbedoMap
-      second:
+    - _DetailAlbedoMap:
-    - first:
-        name: _DetailMask
-      second:
+    - _DetailMask:
-    - first:
-        name: _DetailNormalMap
-      second:
+    - _DetailNormalMap:
-    - first:
-        name: _DiffuseLightingMap
-      second:
+    - _DiffuseLightingMap:
-    - first:
-        name: _EmissionMap
-      second:
+    - _EmissionMap:
-    - first:
-        name: _EmissiveColorMap
-      second:
+    - _EmissiveColorMap:
-    - first:
-        name: _HeightMap
-      second:
+    - _HeightMap:
-    - first:
-        name: _MainTex
-      second:
+    - _MainTex:
-    - first:
-        name: _MaskMap
-      second:
+    - _MaskMap:
-    - first:
-        name: _MetallicGlossMap
-      second:
+    - _MetallicGlossMap:
-    - first:
-        name: _NormalMap
-      second:
+    - _NormalMap:
-    - first:
-        name: _OcclusionMap
-      second:
+    - _OcclusionMap:
-    - first:
-        name: _ParallaxMap
-      second:
+    - _ParallaxMap:
-    - first:
-        name: _SpecularOcclusionMap
-      second:
+    - _SpecularOcclusionMap:
-    - first:
-        name: _SubSurfaceRadiusMap
-      second:
+    - _SubSurfaceRadiusMap:
-    - first:
-        name: _AlphaCutoff
-      second: 0.5
-    - first:
-        name: _AlphaCutoffEnable
-      second: 0
-    - first:
-        name: _BlendMode
-      second: 0
-    - first:
-        name: _BumpScale
-      second: 1
-    - first:
-        name: _CullMode
-      second: 2
-    - first:
-        name: _Cutoff
-      second: 0.5
-    - first:
-        name: _DetailNormalMapScale
-      second: 1
-    - first:
-        name: _DistortionDepthTest
-      second: 0
-    - first:
-        name: _DistortionOnly
-      second: 0
-    - first:
-        name: _DoubleSidedMode
-      second: 0
-    - first:
-        name: _DstBlend
-      second: 10
-    - first:
-        name: _EmissiveColorMode
-      second: 1
-    - first:
-        name: _EmissiveIntensity
-      second: 0
-    - first:
-        name: _GlossMapScale
-      second: 1
-    - first:
-        name: _Glossiness
-      second: 0.5
-    - first:
-        name: _GlossyReflections
-      second: 1
-    - first:
-        name: _HeightBias
-      second: 0
-    - first:
-        name: _HeightMapMode
-      second: 0
-    - first:
-        name: _HeightScale
-      second: 1
-    - first:
-        name: _MaterialId
-      second: 0
-    - first:
-        name: _Metalic
-      second: 0
-    - first:
-        name: _Metallic
-      second: 0
-    - first:
-        name: _Mettalic
-      second: 0
-    - first:
-        name: _Mode
-      second: 0
-    - first:
-        name: _NormalMapSpace
-      second: 0
-    - first:
-        name: _OcclusionStrength
-      second: 1
-    - first:
-        name: _Parallax
-      second: 0.02
-    - first:
-        name: _Smoothness
-      second: 0.5
-    - first:
-        name: _SmoothnessTextureChannel
-      second: 0
-    - first:
-        name: _SpecularHighlights
-      second: 1
-    - first:
-        name: _SrcBlend
-      second: 5
-    - first:
-        name: _SubSurfaceRadius
-      second: 0
-    - first:
-        name: _SurfaceType
-      second: 1
-    - first:
-        name: _UVSec
-      second: 0
-    - first:
-        name: _ZWrite
-      second: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _BlendMode: 0
+    - _BumpScale: 1
+    - _CullMode: 2
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DistortionDepthTest: 0
+    - _DistortionOnly: 0
+    - _DoubleSidedMode: 0
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _HeightBias: 0
+    - _HeightMapMode: 0
+    - _HeightScale: 1
+    - _MaterialId: 0
+    - _Metalic: 0
+    - _Metallic: 0
+    - _Mettalic: 0
+    - _Mode: 0
+    - _NormalMapSpace: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _SubSurfaceRadius: 0
+    - _SurfaceType: 1
+    - _UVSec: 0
+    - _ZWrite: 0
-    - first:
-        name: _BaseColor
-      second: {r: 0.9117647, g: 0.1273789, b: 0.1273789, a: 0.566}
-    - first:
-        name: _Color
-      second: {r: 1, g: 1, b: 1, a: 1}
-    - first:
-        name: _EmissionColor
-      second: {r: 0, g: 0, b: 0, a: 1}
-    - first:
-        name: _EmissiveColor
-      second: {r: 0, g: 0, b: 0, a: 1}
+    - _BaseColor: {r: 0.9117647, g: 0.1273789, b: 0.1273789, a: 0.566}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/test-transparent.mat
+++ b/Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/test-transparent.mat
  stringTagMap:
    RenderType: Transparent
  m_SavedProperties:
-    serializedVersion: 2
+    serializedVersion: 3
-    - first:
-        name: _AmbientOcclusionMap
-      second:
+    - _AmbientOcclusionMap:
-    - first:
-        name: _BaseColorMap
-      second:
+    - _BaseColorMap:
-    - first:
-        name: _BumpMap
-      second:
+    - _BumpMap:
-    - first:
-        name: _CoatCoverageMap
-      second:
+    - _CoatCoverageMap:
-    - first:
-        name: _CoatRoughnessMap
-      second:
+    - _CoatRoughnessMap:
-    - first:
-        name: _DetailAlbedoMap
-      second:
+    - _DetailAlbedoMap:
-    - first:
-        name: _DetailMask
-      second:
+    - _DetailMask:
-    - first:
-        name: _DetailNormalMap
-      second:
+    - _DetailNormalMap:
-    - first:
-        name: _DiffuseLightingMap
-      second:
+    - _DiffuseLightingMap:
-    - first:
-        name: _DiffuseMap
-      second:
+    - _DiffuseMap:
-    - first:
-        name: _EmissionMap
-      second:
+    - _EmissionMap:
-    - first:
-        name: _EmissiveColorMap
-      second:
+    - _EmissiveColorMap:
-    - first:
-        name: _HeightMap
-      second:
+    - _HeightMap:
-    - first:
-        name: _MainTex
-      second:
+    - _MainTex:
-    - first:
-        name: _MaskMap
-      second:
+    - _MaskMap:
-    - first:
-        name: _MetallicGlossMap
-      second:
+    - _MetallicGlossMap:
-    - first:
-        name: _MettalicMap
-      second:
+    - _MettalicMap:
-    - first:
-        name: _NormalMap
-      second:
+    - _NormalMap:
-    - first:
-        name: _OcclusionMap
-      second:
+    - _OcclusionMap:
-    - first:
-        name: _ParallaxMap
-      second:
+    - _ParallaxMap:
-    - first:
-        name: _SmoothnessMap
-      second:
+    - _SmoothnessMap:
-    - first:
-        name: _SpecMap
-      second:
+    - _SpecMap:
-    - first:
-        name: _SpecularOcclusionMap
-      second:
+    - _SpecularOcclusionMap:
-    - first:
-        name: _SubSurfaceRadiusMap
-      second:
+    - _SubSurfaceRadiusMap:
-    - first:
-        name: _ThicknessMap
-      second:
+    - _ThicknessMap:
-    - first:
-        name: _AlphaCutoff
-      second: 0.5
-    - first:
-        name: _AlphaCutoffEnable
-      second: 0
-    - first:
-        name: _BlendMode
-      second: 0
-    - first:
-        name: _BumpScale
-      second: 1
-    - first:
-        name: _CoatCoverage
-      second: 0
-    - first:
-        name: _CoatRoughness
-      second: 0
-    - first:
-        name: _CullMode
-      second: 2
-    - first:
-        name: _Cutoff
-      second: 0.5
-    - first:
-        name: _DetailNormalMapScale
-      second: 1
-    - first:
-        name: _DistortionDepthTest
-      second: 0
-    - first:
-        name: _DistortionOnly
-      second: 0
-    - first:
-        name: _DoubleSided
-      second: 1
-    - first:
-        name: _DoubleSidedLigthing
-      second: 1
-    - first:
-        name: _DoubleSidedMode
-      second: 0
-    - first:
-        name: _DstBlend
-      second: 10
-    - first:
-        name: _EmissiveColorMode
-      second: 1
-    - first:
-        name: _EmissiveIntensity
-      second: 0
-    - first:
-        name: _GlossMapScale
-      second: 1
-    - first:
-        name: _Glossiness
-      second: 0.5
-    - first:
-        name: _GlossyReflections
-      second: 1
-    - first:
-        name: _HeightBias
-      second: 0
-    - first:
-        name: _HeightMapMode
-      second: 0
-    - first:
-        name: _HeightScale
-      second: 1
-    - first:
-        name: _MaterialID
-      second: 0
-    - first:
-        name: _MaterialId
-      second: 0
-    - first:
-        name: _Metalic
-      second: 0
-    - first:
-        name: _Metallic
-      second: 0
-    - first:
-        name: _Mettalic
-      second: 0
-    - first:
-        name: _Mode
-      second: 0
-    - first:
-        name: _NormalMapSpace
-      second: 0
-    - first:
-        name: _OcclusionStrength
-      second: 1
-    - first:
-        name: _Parallax
-      second: 0.02
-    - first:
-        name: _Smoothness
-      second: 0.524
-    - first:
-        name: _SmoothnessTextureChannel
-      second: 0
-    - first:
-        name: _SpecularHighlights
-      second: 1
-    - first:
-        name: _SrcBlend
-      second: 5
-    - first:
-        name: _SubSurfaceProfile
-      second: 0
-    - first:
-        name: _SubSurfaceRadius
-      second: 0
-    - first:
-        name: _SurfaceType
-      second: 1
-    - first:
-        name: _Thickness
-      second: 0
-    - first:
-        name: _UVSec
-      second: 0
-    - first:
-        name: _ZWrite
-      second: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _BlendMode: 0
+    - _BumpScale: 1
+    - _CoatCoverage: 0
+    - _CoatRoughness: 0
+    - _CullMode: 2
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DistortionDepthTest: 0
+    - _DistortionOnly: 0
+    - _DoubleSided: 1
+    - _DoubleSidedLigthing: 1
+    - _DoubleSidedMode: 0
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _HeightBias: 0
+    - _HeightMapMode: 0
+    - _HeightScale: 1
+    - _MaterialID: 0
+    - _MaterialId: 0
+    - _Metalic: 0
+    - _Metallic: 0
+    - _Mettalic: 0
+    - _Mode: 0
+    - _NormalMapSpace: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Smoothness: 0.524
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _SubSurfaceProfile: 0
+    - _SubSurfaceRadius: 0
+    - _SurfaceType: 1
+    - _Thickness: 0
+    - _UVSec: 0
+    - _ZWrite: 0
-    - first:
-        name: _BaseColor
-      second: {r: 1, g: 1, b: 1, a: 0.397}
-    - first:
-        name: _Color
-      second: {r: 1, g: 1, b: 1, a: 1}
-    - first:
-        name: _DiffuseColor
-      second: {r: 1, g: 1, b: 1, a: 1}
-    - first:
-        name: _EmissionColor
-      second: {r: 0, g: 0, b: 0, a: 1}
-    - first:
-        name: _EmissiveColor
-      second: {r: 0, g: 0, b: 0, a: 1}
-    - first:
-        name: _SpecColor
-      second: {r: 0.04, g: 0.04, b: 0.04, a: 1}
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 0.397}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _DiffuseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.04, g: 0.04, b: 0.04, a: 1}