[HDRP backport 10.x.x] Shader abstraction cleanup #3443

Author: robinb-u3d

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

@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - Updated the tooltip for the Decal Angle Fade property (requires to enable Decal Layers in both HDRP asset and Frame settings) (case 1308048).
+- Tidy up of platform abstraction code for shader optimization.
 
 ## [10.3.1] - 2020-01-26
 

com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ContactShadows.compute

@@ -2,10 +2,6 @@
 
 #pragma multi_compile _ ENABLE_MSAA
 
-#ifdef SHADER_API_PSSL
-#   pragma argument( scheduler=minpressure ) // instruct the shader compiler to prefer minimizing vgpr usage
-#endif
-
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
 #include "Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl"
 #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/NormalBuffer.hlsl"
@@ -16,6 +12,10 @@
 
 #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch
 
+#ifdef SHADER_API_PSSL
+#include SHADER_COMPILER_GLOBAL_OPTIMIZE_REGISTER_USAGE
+#endif
+
 // #pragma enable_d3d11_debug_symbols
 
 #ifdef ENABLE_MSAA

com.unity.visualeffectgraph/CHANGELOG.md

@@ -29,6 +29,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Deleting a context node and a block while both are selected throws a null ref exception. [Case 315578](https://issuetracker.unity3d.com/product/unity/issues/guid/1315578/)
 - Fixed shader compilation errors with textures in shader graph [Case 1309219](https://issuetracker.unity3d.com/product/unity/issues/guid/1309219/)
 
+### Changed
+- Tidy up of platform abstraction code for random number generation, requires a dependency on com.unity.render-pipelines.core for those abstractions.
+ 
 ## [10.3.1] - 2020-01-26
 
 Version Updated

com.unity.visualeffectgraph/Shaders/VFXCommon.hlsl

@@ -1,3 +1,6 @@
+// Required for the correct use of cross platform abstractions.
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
+
 //Helper to disable bounding box compute code
 #define USE_DYNAMIC_AABB 1
 
@@ -267,7 +270,7 @@ uint VFXMul24(uint a, uint b)
 #ifndef SHADER_API_PSSL
     return (a & 0xffffff) * (b & 0xffffff); // Tmp to ensure correct inputs
 #else
-    return mul24(a, b);
+    return Mul24(a, b);
 #endif
 }
 
@@ -311,7 +314,7 @@ uint Lcg(uint seed)
     const uint multiplier = 0x0019660d;
     const uint increment = 0x3c6ef35f;
 #if RAND_24BITS && defined(SHADER_API_PSSL)
-    return mad24(multiplier, seed, increment);
+    return Mad24(multiplier, seed, increment);
 #else
     return multiplier * seed + increment;
 #endif
@@ -321,7 +324,7 @@ float ToFloat01(uint u)
 {
 #if !RAND_24BITS
     return asfloat((u >> 9) | 0x3f800000) - 1.0f;
-#else //Using mad24 keeping consitency between platform
+#else //Using Mad24 keeping consitency between platform
     return asfloat((u & 0x007fffff) | 0x3f800000) - 1.0f;
 #endif
 }

com.unity.visualeffectgraph/package.json

@@ -14,6 +14,7 @@
   ],
   "dependencies": {
     "com.unity.shadergraph": "10.4.0"
+    "com.unity.render-pipelines.core": "10.4.0"
   },
   "samples": [
     {