Fix HDRP build issues with DOTS_INSTANCING_ON shader variant (#6490)

Co-authored-by: Vincent Breysse <[email protected]>

Author: vincent-breysse

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

@@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed a warning because of a null texture in the lens flare pass.
 - Fixed a nullref when enabling raycount without ray tracing.
 - Fixed error thrown when layered lit material has an invalid material type.
+- Fixed HDRP build issues with DOTS_INSTANCING_ON shader variant.
 
 ## [13.1.2] - 2021-11-05
 

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

@@ -10,12 +10,10 @@
 #undef SHADEROPTIONS_CAMERA_RELATIVE_RENDERING
 
 // Define the correct matrices
+#ifndef UNITY_DOTS_INSTANCING_ENABLED
+
 #undef unity_ObjectToWorld
 #undef unity_MatrixPreviousM
-#undef unity_MatrixVP
-float4x4 unity_MatrixV;
-float4x4 unity_MatrixVP;
-float4x4 glstate_matrix_projection;
 
 #undef UNITY_MATRIX_M
 #define UNITY_MATRIX_M unity_ObjectToWorld
@@ -29,6 +27,13 @@ float4x4 glstate_matrix_projection;
 #undef UNITY_PREV_MATRIX_I_M
 #define UNITY_PREV_MATRIX_I_M Inverse(unity_MatrixPreviousM)
 
+#endif
+
+#undef unity_MatrixVP
+float4x4 unity_MatrixV;
+float4x4 unity_MatrixVP;
+float4x4 glstate_matrix_projection;
+
 #undef UNITY_MATRIX_V
 #define UNITY_MATRIX_V unity_MatrixV