[Feature] Skinned motion vectors for HDRP Hybrid

com.unity.render-pipelines.core/ShaderLibrary/DotsDeformation.hlsl

@@ -0,0 +1,81 @@
+#if defined(DOTS_INSTANCING_ON)
+struct DeformedVertexData
+{
+    float3 Position;
+    float3 Normal;
+    float3 Tangent;
+};
+
+int _HybridDeformedVertexStreamIndex;
+uniform StructuredBuffer<DeformedVertexData> _DeformedMeshData;
+uniform StructuredBuffer<DeformedVertexData> _PreviousFrameDeformedMeshData;
+
+// Reads vertex data for compute skinned meshes in Hybdrid Renderer
+void FetchComputeVertexData(inout float3 pos, inout float3 nrm, inout float4 tan, in uint vertexID)
+{
+    // x,y = current and previous frame indices
+    // z = deformation check (0 = no deformation, 1 = has deformation)
+    // w = skinned motion vectors
+    const int4 deformProperty = asint(unity_DOTSDeformationParams);
+    const int doSkinning = deformProperty.z;
+    if (doSkinning == 1)
+    {
+        const int streamIndex = _HybridDeformedVertexStreamIndex;
+        const int startIndex = deformProperty[streamIndex];
+        const DeformedVertexData vertexData = _DeformedMeshData[startIndex + vertexID];
+
+        pos = vertexData.Position;
+        nrm = vertexData.Normal;
+        tan = float4(vertexData.Tangent, 0);
+    }
+}
+
+void FetchComputeVertexPosNrm(inout float3 pos, inout float3 nrm, in uint vertexID)
+{
+    // x,y = current and previous frame indices
+    // z = deformation check (0 = no deformation, 1 = has deformation)
+    // w = skinned motion vectors
+    const int4 deformProperty = asint(unity_DOTSDeformationParams);
+    const int doSkinning = deformProperty.z;
+    if (doSkinning == 1)
+    {
+        const int streamIndex = _HybridDeformedVertexStreamIndex;
+        const int startIndex = deformProperty[streamIndex];
+        const DeformedVertexData vertexData = _DeformedMeshData[startIndex + vertexID];
+
+        pos = vertexData.Position;
+        nrm = vertexData.Normal;
+    }
+}
+
+void FetchComputeVertexNormal(inout float3 normal, in uint vertexID)
+{
+    const int4 deformProperty = asint(unity_DOTSDeformationParams);
+    const int doSkinning = deformProperty.z;
+    if (doSkinning == 1)
+    {
+        const int streamIndex = _HybridDeformedVertexStreamIndex;
+        const int startIndex = deformProperty[streamIndex];
+
+        normal = _DeformedMeshData[startIndex + vertexID].Normal;
+    }
+}
+
+void FetchComputeVertexPosition(inout float3 position, in uint vertexID)
+{
+    const int4 deformProperty = asint(unity_DOTSDeformationParams);
+    const int doSkinning = deformProperty.z;
+    if (doSkinning == 1)
+    {
+        const int streamIndex = _HybridDeformedVertexStreamIndex;
+        const int startIndex = deformProperty[streamIndex];
+
+        position = _DeformedMeshData[startIndex + vertexID].Position;
+    }
+}
+
+void FetchComputeVertexPosition(inout float4 position, in uint vertexID)
+{
+    FetchComputeVertexPosition(position.xyz, vertexID);
+}
+#endif

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -21,6 +21,7 @@ The version number for this package has increased due to a version update of a r
 - Added light unit slider for automatic and automatic histrogram exposure limits.
 - Added View Bias for mesh decals.
 - Added support for the PlayStation 5 platform.
+- Added support for skinned motionvectors when using Hybrid Renderer V2.
 
 ### Fixed
 - Fixed computation of geometric normal in path tracing (case 1293029).
@@ -113,6 +114,7 @@ The version number for this package has increased due to a version update of a r
 - Transparent materials created by the Model Importer are set to not cast shadows. ( case 1295747)
 - Change some light unit slider value ranges to better reflect the lighting scenario.
 - Change the tooltip for color shadows and semi-transparent shadows (case 1307704).
+- Compute Deformation Node no longer needs to be added manually in Shader Graph for skinning to work with Hybrid Renderer V2.
 
 ## [10.2.1] - 2020-11-30
 

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDStructFields.cs

@@ -28,8 +28,13 @@ public struct AttributesMesh
                 "COLOR", subscriptOptions : StructFieldOptions.Optional);
             public static FieldDescriptor instanceID = new FieldDescriptor(AttributesMesh.name, "instanceID", "", ShaderValueType.Uint,
                 "INSTANCEID_SEMANTIC", "UNITY_ANY_INSTANCING_ENABLED");
+#if ENABLE_HYBRID_RENDERER_V2
+            public static FieldDescriptor vertexID = new FieldDescriptor(AttributesMesh.name, "vertexID", "", ShaderValueType.Uint,
+                "SV_VertexID", "DOTS_INSTANCING_ON");
+#else
             public static FieldDescriptor vertexID = new FieldDescriptor(AttributesMesh.name, "vertexID", "ATTRIBUTES_NEED_VERTEXID", ShaderValueType.Uint,
                 "SV_VertexID", subscriptOptions: StructFieldOptions.Optional);
+#endif
         }
 
         public struct VaryingsMeshToPS

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs

@@ -1339,6 +1339,8 @@ void UpdateShaderVariablesGlobalCB(HDCamera hdCamera, CommandBuffer cmd)
                 m_ShaderVariablesGlobalCB._EnableRecursiveRayTracing = 0;
                 m_ShaderVariablesGlobalCB._SpecularOcclusionBlend = 1.0f;
             }
+
+            m_ShaderVariablesGlobalCB._HybridDeformedVertexStreamIndex = UnityEngine.Time.frameCount & 1;
 
             ConstantBuffer.PushGlobal(cmd, m_ShaderVariablesGlobalCB, HDShaderIDs._ShaderVariablesGlobal);
         }

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/DotsDeformation.hlsl

@@ -0,0 +1,66 @@
+#if defined(DOTS_INSTANCING_ON)
+struct DeformedVertexData
+{
+    float3 Position;
+    float3 Normal;
+    float3 Tangent;
+};
+
+uniform StructuredBuffer<DeformedVertexData> _DeformedMeshData;
+uniform StructuredBuffer<DeformedVertexData> _PreviousFrameDeformedMeshData;
+
+// Reads vertex data for compute skinned meshes in Hybdrid Renderer
+void FetchComputeVertexData(inout AttributesMesh input)
+{
+    // x,y = current and previous frame indices
+    // z = deformation check (0 = no deformation, 1 = has deformation)
+    // w = skinned motion vectors
+    const int4 deformProperty = asint(unity_DOTSDeformationParams);
+    const int doSkinning = deformProperty.z;
+    if (doSkinning == 1)
+    {
+        const uint streamIndex = _HybridDeformedVertexStreamIndex;
+        const uint startIndex = deformProperty[streamIndex];
+        const DeformedVertexData vertexData = _DeformedMeshData[startIndex + input.vertexID];
+
+        input.positionOS = vertexData.Position;
+#ifdef ATTRIBUTES_NEED_NORMAL
+        input.normalOS = vertexData.Normal;
+#endif
+#ifdef ATTRIBUTES_NEED_TANGENT
+        input.tangentOS = float4(vertexData.Tangent, 0);
+#endif
+    }
+}
+
+// Reads vertex position for compute skinned meshes in Hybdrid Renderer
+// and also previous frame position if skinned motion vectors are used
+void FetchComputeVertexPosition(inout float3 currPos, inout float3 prevPos, uint vertexID)
+{
+    // x,y = current and previous frame indices
+    // z = deformation check (0 = no deformation, 1 = has deformation)
+    // w = skinned motion vectors
+    const int4 deformProperty = asint(unity_DOTSDeformationParams);
+    const int computeSkin = deformProperty.z;
+    const uint streamIndex = _HybridDeformedVertexStreamIndex;
+    if (computeSkin == 1)
+    {
+        const uint currMeshStart = deformProperty[streamIndex]; 
+        const uint currStreamIndex = _HybridDeformedVertexStreamIndex;
+        currPos = _DeformedMeshData[currMeshStart + vertexID].Position;
+    }
+
+    const int skinMotionVec = deformProperty.w;
+    if (skinMotionVec == 1)
+    {
+        const uint prevStreamIndex = streamIndex ^ 1;
+        const int prevMeshStart = deformProperty[prevStreamIndex];
+
+        if(prevMeshStart == -1)
+            prevPos = _DeformedMeshData[prevMeshStart + vertexID].Position;
+        else
+            prevPos = _PreviousFrameDeformedMeshData[prevMeshStart + vertexID].Position;
+
+    }
+}
+#endif

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/MotionVectorVertexShaderCommon.hlsl

@@ -87,7 +87,6 @@ void MotionVectorPositionZBias(VaryingsToPS input)
 
 PackedVaryingsType MotionVectorVS(inout VaryingsType varyingsType, AttributesMesh inputMesh, AttributesPass inputPass)
 {
-
 #if !defined(TESSELLATION_ON)
     MotionVectorPositionZBias(varyingsType);
 #endif
@@ -107,15 +106,21 @@ PackedVaryingsType MotionVectorVS(inout VaryingsType varyingsType, AttributesMes
     {
         bool hasDeformation = unity_MotionVectorsParams.x > 0.0; // Skin or morph target
 
-        float3 effectivePositionOS = (hasDeformation ? inputPass.previousPositionOS : inputMesh.positionOS);
+        float3 deformedPrevPos = inputPass.previousPositionOS;
+
+#if defined(DOTS_INSTANCING_ON)
+        FetchComputeVertexPosition(inputMesh.positionOS, deformedPrevPos, inputMesh.vertexID);
+#endif
+        float3 effectivePositionOS = (hasDeformation) ? deformedPrevPos : inputMesh.positionOS;
+
 #if defined(_ADD_PRECOMPUTED_VELOCITY)
         effectivePositionOS -= inputPass.precomputedVelocity;
 #endif
 
     // Need to apply any vertex animation to the previous worldspace position, if we want it to show up in the motion vector buffer
 #if defined(HAVE_MESH_MODIFICATION)
         AttributesMesh previousMesh = inputMesh;
-        previousMesh.positionOS = effectivePositionOS ;
+        previousMesh.positionOS = effectivePositionOS;
 
         previousMesh = ApplyMeshModification(previousMesh, _LastTimeParameters.xyz);
         float3 previousPositionRWS = TransformPreviousObjectToWorld(previousMesh.positionOS);

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VaryingMesh.hlsl

@@ -22,7 +22,9 @@ struct AttributesMesh
 #ifdef ATTRIBUTES_NEED_COLOR
     float4 color        : COLOR;
 #endif
-
+#ifdef DOTS_INSTANCING_ON
+    uint vertexID        : SV_VertexID;
+#endif
     UNITY_VERTEX_INPUT_INSTANCE_ID
 };
 

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl

@@ -126,6 +126,8 @@ VaryingsToDS InterpolateWithBaryCoordsToDS(VaryingsToDS input0, VaryingsToDS inp
 #define PackVaryingsType PackVaryingsToPS
 #endif
 
+#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/DotsDeformation.hlsl"
+
 // TODO: Here we will also have all the vertex deformation (GPU skinning, vertex animation, morph target...) or we will need to generate a compute shaders instead (better! but require work to deal with unpacking like fp16)
 // Make it inout so that MotionVectorPass can get the modified input values later.
 VaryingsMeshType VertMesh(AttributesMesh input, float3 worldSpaceOffset)
@@ -135,6 +137,10 @@ VaryingsMeshType VertMesh(AttributesMesh input, float3 worldSpaceOffset)
     UNITY_SETUP_INSTANCE_ID(input);
     UNITY_TRANSFER_INSTANCE_ID(input, output);
 
+#if defined(DOTS_INSTANCING_ON)
+    FetchComputeVertexData(input);
+#endif
+
 #if defined(HAVE_MESH_MODIFICATION)
     input = ApplyMeshModification(input, _TimeParameters.xyz);
 #endif

com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl

@@ -372,6 +372,8 @@ UNITY_DOTS_INSTANCING_START(BuiltinPropertyMetadata)
     UNITY_DOTS_INSTANCED_PROP(float4,   unity_ProbesOcclusion)
     UNITY_DOTS_INSTANCED_PROP(float3x4, unity_MatrixPreviousM)
     UNITY_DOTS_INSTANCED_PROP(float3x4, unity_MatrixPreviousMI)
+    UNITY_DOTS_INSTANCED_PROP(float4,   unity_MotionVectorsParams)
+    UNITY_DOTS_INSTANCED_PROP(float4,   unity_DOTSDeformationParams)
 UNITY_DOTS_INSTANCING_END(BuiltinPropertyMetadata)
 
 // Note: Macros for unity_ObjectToWorld and unity_WorldToObject are declared elsewhere
@@ -391,7 +393,8 @@ UNITY_DOTS_INSTANCING_END(BuiltinPropertyMetadata)
 #define unity_ProbesOcclusion       UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float4,   Metadata_unity_ProbesOcclusion)
 #define unity_MatrixPreviousM       LoadDOTSInstancedData_float4x4_from_float3x4(UNITY_DOTS_INSTANCED_METADATA_NAME_FROM_MACRO(float3x4, Metadata_unity_MatrixPreviousM))
 #define unity_MatrixPreviousMI      LoadDOTSInstancedData_float4x4_from_float3x4(UNITY_DOTS_INSTANCED_METADATA_NAME_FROM_MACRO(float3x4, Metadata_unity_MatrixPreviousMI))
-
+#define unity_MotionVectorsParams   UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float4,   Metadata_unity_MotionVectorsParams)
+#define unity_DOTSDeformationParams UNITY_ACCESS_DOTS_INSTANCED_PROP_FROM_MACRO(float4,   Metadata_unity_DOTSDeformationParams)
 #endif
 
 // Define View/Projection matrix macro

com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs

@@ -269,6 +269,6 @@ unsafe struct ShaderVariablesGlobal
         public float    _GlobalTessellationFactorMultiplier;
 
         public float    _SpecularOcclusionBlend;
-        public float    _Pad9;
+        public int      _HybridDeformedVertexStreamIndex;
     }
 }

com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl

@@ -152,7 +152,7 @@ GLOBAL_CBUFFER_START(ShaderVariablesGlobal, b0)
     int _TransparentCameraOnlyMotionVectors;
     float _GlobalTessellationFactorMultiplier;
     float _SpecularOcclusionBlend;
-    float _Pad9;
+    int _HybridDeformedVertexStreamIndex;
 CBUFFER_END
 
 

com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/DepthNormalsOnlyPass.hlsl

@@ -1,10 +1,16 @@
 #ifndef SG_DEPTH_ONLY_PASS_INCLUDED
 #define SG_DEPTH_ONLY_PASS_INCLUDED
 
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/DotsDeformation.hlsl"
+
 PackedVaryings vert(Attributes input)
 {
     Varyings output = (Varyings)0;
     output = BuildVaryings(input);
+
+#if defined(DOTS_INSTANCING_ON)
+    FetchComputeVertexPosNrm(input.positionOS, input.normalOS, input.vertexID);
+#endif
     PackedVaryings packedOutput = (PackedVaryings)0;
     packedOutput = PackVaryings(output);
     return packedOutput;

com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/DepthOnlyPass.hlsl

@@ -1,9 +1,14 @@
 #ifndef SG_DEPTH_ONLY_PASS_INCLUDED
 #define SG_DEPTH_ONLY_PASS_INCLUDED
 
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/DotsDeformation.hlsl"
+
 PackedVaryings vert(Attributes input)
 {
     Varyings output = (Varyings)0;
+#if defined(DOTS_INSTANCING_ON)
+    FetchComputeVertexPosition(input.positionOS, input.vertexID);
+#endif
     output = BuildVaryings(input);
     PackedVaryings packedOutput = (PackedVaryings)0;
     packedOutput = PackVaryings(output);

com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl

@@ -34,9 +34,14 @@ void BuildInputData(Varyings input, SurfaceDescription surfaceDescription, out I
     inputData.shadowMask = SAMPLE_SHADOWMASK(input.lightmapUV);
 }
 
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/DotsDeformation.hlsl"
+
 PackedVaryings vert(Attributes input)
 {
     Varyings output = (Varyings)0;
+#if defined(DOTS_INSTANCING_ON)
+    FetchComputeVertexData(input.positionOS, input.normalOS, input.tangentOS, input.vertexID);
+#endif
     output = BuildVaryings(input);
     PackedVaryings packedOutput = (PackedVaryings)0;
     packedOutput = PackVaryings(output);

com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl

@@ -32,9 +32,14 @@ void BuildInputData(Varyings input, SurfaceDescription surfaceDescription, out I
     inputData.shadowMask = SAMPLE_SHADOWMASK(input.lightmapUV);
 }
 
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/DotsDeformation.hlsl"
+
 PackedVaryings vert(Attributes input)
 {
     Varyings output = (Varyings)0;
+#if defined(DOTS_INSTANCING_ON)
+    FetchComputeVertexData(input.positionOS, input.normalOS, input.tangentOS, input.vertexID);
+#endif
     output = BuildVaryings(input);
     PackedVaryings packedOutput = (PackedVaryings)0;
     packedOutput = PackVaryings(output);

com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/ShadowCasterPass.hlsl

@@ -1,9 +1,14 @@
 #ifndef SG_SHADOW_PASS_INCLUDED
 #define SG_SHADOW_PASS_INCLUDED
 
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/DotsDeformation.hlsl"
+
 PackedVaryings vert(Attributes input)
 {
     Varyings output = (Varyings)0;
+#if defined(DOTS_INSTANCING_ON)
+    FetchComputeVertexData(input.positionOS, input.normalOS, input.tangentOS, input.vertexID);
+#endif
     output = BuildVaryings(input);
     PackedVaryings packedOutput = (PackedVaryings)0;
     packedOutput = PackVaryings(output);

com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UnlitPass.hlsl

@@ -1,6 +1,12 @@
-PackedVaryings vert(Attributes input)
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/DotsDeformation.hlsl"
+
+PackedVaryings vert(Attributes input)
 {
     Varyings output = (Varyings)0;
+
+#if defined(DOTS_INSTANCING_ON)
+    FetchComputeVertexData(input.positionOS, input.normalOS, input.tangentOS, input.vertexID);
+#endif
     output = BuildVaryings(input);
     PackedVaryings packedOutput = PackVaryings(output);
     return packedOutput;