Merge pull request #16 from Zallist/urp-14-unity-2022.2

Updated files to match the changes done to the LIT shader for URP 14.…

Author: Zallist

Editor/ShaderGraph/Includes/SimpleLitForwardPass.hlsl

@@ -22,7 +22,11 @@ void InitializeInputData(Varyings input, SurfaceDescription surfaceDescription,
         inputData.normalWS = input.normalWS;
     #endif
     inputData.normalWS = NormalizeNormalPerPixel(inputData.normalWS);
+#if UNITY_VERSION >= 202220
+    inputData.viewDirectionWS = GetWorldSpaceNormalizeViewDir(input.positionWS);
+#else
     inputData.viewDirectionWS = SafeNormalize(GetWorldSpaceViewDir(input.positionWS));
+#endif
 
     #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
         inputData.shadowCoord = input.shadowCoord;
@@ -63,13 +67,42 @@ PackedVaryings vert(Attributes input)
     return packedOutput;
 }
 
+#if UNITY_VERSION >= 202220
+void frag(
+    PackedVaryings packedInput
+    , out half4 outColor : SV_Target0
+#ifdef _WRITE_RENDERING_LAYERS
+    , out float4 outRenderingLayers : SV_Target1
+#endif
+)
+#else
 half4 frag(PackedVaryings packedInput) : SV_TARGET
+#endif //UNITY_VERSION 202220
 {
     Varyings unpacked = UnpackVaryings(packedInput);
     UNITY_SETUP_INSTANCE_ID(unpacked);
     UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(unpacked);
     SurfaceDescription surfaceDescription = BuildSurfaceDescription(unpacked);
 
+#if UNITY_VERSION >= 202220
+#if defined(_SURFACE_TYPE_TRANSPARENT)
+    bool isTransparent = true;
+#else
+    bool isTransparent = false;
+#endif
+
+#if defined(_ALPHATEST_ON)
+    half alpha = AlphaDiscard(surfaceDescription.Alpha, surfaceDescription.AlphaClipThreshold);
+#elif defined(_SURFACE_TYPE_TRANSPARENT)
+    half alpha = surfaceDescription.Alpha;
+#else
+    half alpha = half(1.0);
+#endif
+
+    #if defined(LOD_FADE_CROSSFADE) && USE_UNITY_CROSSFADE
+        LODFadeCrossFade(unpacked.positionCS);
+    #endif
+#else
     #if _ALPHATEST_ON
         half alpha = surfaceDescription.Alpha;
         clip(alpha - surfaceDescription.AlphaClipThreshold);
@@ -78,6 +111,7 @@ half4 frag(PackedVaryings packedInput) : SV_TARGET
     #else
         half alpha = 1;
     #endif
+#endif //UNITY_VERSION 202220
 
     InputData inputData;
     InitializeInputData(unpacked, surfaceDescription, inputData);
@@ -110,11 +144,6 @@ half4 frag(PackedVaryings packedInput) : SV_TARGET
     surface.clearCoatMask       = 0;
     surface.clearCoatSmoothness = 1;
 
-    //#ifdef _CLEARCOAT
-    //    surface.clearCoatMask       = saturate(surfaceDescription.CoatMask);
-    //    surface.clearCoatSmoothness = saturate(surfaceDescription.CoatSmoothness);
-    //#endif
-
 #if UNITY_VERSION >= 202210
     surface.albedo = AlphaModulate(surface.albedo, surface.alpha);
 #endif
@@ -123,9 +152,21 @@ half4 frag(PackedVaryings packedInput) : SV_TARGET
     ApplyDecalToSurfaceData(unpacked.positionCS, surface, inputData);
 #endif
 
-    //half4 color = UniversalFragmentPBR(inputData, surface);
     half4 color = UniversalFragmentBlinnPhong(inputData, surface);
 
     color.rgb = MixFog(color.rgb, inputData.fogCoord);
+#if UNITY_VERSION >= 202220
+
+    color.a = OutputAlpha(color.a, isTransparent);
+
+    outColor = color;
+
+#ifdef _WRITE_RENDERING_LAYERS
+    uint renderingLayers = GetMeshRenderingLayer();
+    outRenderingLayers = float4(EncodeMeshRenderingLayer(renderingLayers), 0, 0, 0);
+#endif
+
+#else
     return color;
+#endif //UNITY_VERSION 202220
 }

Editor/ShaderGraph/Includes/SimpleLitGBufferPass.hlsl

@@ -23,7 +23,11 @@ void InitializeInputData(Varyings input, SurfaceDescription surfaceDescription,
         inputData.normalWS = input.normalWS;
     #endif
     inputData.normalWS = NormalizeNormalPerPixel(inputData.normalWS);
+#if UNITY_VERSION >= 202220
+    inputData.viewDirectionWS = GetWorldSpaceNormalizeViewDir(input.positionWS);
+#else
     inputData.viewDirectionWS = SafeNormalize(GetWorldSpaceViewDir(input.positionWS));
+#endif
 
 #if defined(MAIN_LIGHT_CALCULATE_SHADOWS)
     inputData.shadowCoord = TransformWorldToShadowCoord(inputData.positionWS);
@@ -78,6 +82,12 @@ FragmentOutput frag(PackedVaryings packedInput)
         half alpha = 1;
     #endif
 
+#if UNITY_VERSION >= 202220
+    #if defined(LOD_FADE_CROSSFADE) && USE_UNITY_CROSSFADE
+        LODFadeCrossFade(unpacked.positionCS);
+    #endif
+#endif
+
     InputData inputData;
     InitializeInputData(unpacked, surfaceDescription, inputData);
     // TODO: Mip debug modes would require this, open question how to do this on ShaderGraph.