Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging

# Conflicts:
#	Packages/com.unity.render-pipelines.core/ShaderLibrary/TextureXR.hlsl

Packages/com.unity.render-pipelines.core/ShaderLibrary/TextureXR.hlsl

@@ -60,6 +60,10 @@
     #define TEXTURE2D_X_ARGS                                                 TEXTURE2D_ARRAY_ARGS
     #define TEXTURE2D_X_HALF                                                 TEXTURE2D_ARRAY_HALF
     #define TEXTURE2D_X_FLOAT                                                TEXTURE2D_ARRAY_FLOAT
+    // WW1MOD: reinstated uint texture type macros, because these things are actually used in places
+    #define TEXTURE2D_X_UINT(textureName)                                    Texture2DArray<uint> textureName
+    #define TEXTURE2D_X_UINT2(textureName)                                   Texture2DArray<uint2> textureName
+    #define TEXTURE2D_X_UINT4(textureName)                                   Texture2DArray<uint4> textureName
     //Using explicit sample count of 1 to force DXC to actually reflect the texture as MS. The actual count appears to be irrelevant and any 2D MS texture array should bind to it
     #define TEXTURE2D_X_MSAA(type, textureName)                              Texture2DMSArray<type, 1> textureName
 
@@ -86,6 +90,10 @@
     #define TEXTURE2D_X_ARGS                                                 TEXTURE2D_ARGS
     #define TEXTURE2D_X_HALF                                                 TEXTURE2D_HALF
     #define TEXTURE2D_X_FLOAT                                                TEXTURE2D_FLOAT
+    // WW1MOD: reinstated uint texture type macros, because these things are actually used in places
+    #define TEXTURE2D_X_UINT(textureName)                                    Texture2D<uint> textureName
+    #define TEXTURE2D_X_UINT2(textureName)                                   Texture2D<uint2> textureName
+    #define TEXTURE2D_X_UINT4(textureName)                                   Texture2D<uint4> textureName
     //Using explicit sample count of 1 to force DXC to actually reflect the texture as MS. The actual count appears to be irrelevant and any 2D MS texture should bind to it
     #define TEXTURE2D_X_MSAA(type, textureName)                              Texture2DMS<type, 1> textureName