urp forward+

Author: z3y

Editor/Generation/TemplateOutput.cs

@@ -278,7 +278,7 @@ protected static void AddURPLightingPragmas(PassBuilder pass)
             // pass.pragmas.Add("#pragma multi_compile_fragment _ _DBUFFER_MRT1 _DBUFFER_MRT2 _DBUFFER_MRT3");
             pass.pragmas.Add("#pragma multi_compile_fragment _ _LIGHT_COOKIES");
             pass.pragmas.Add("#pragma multi_compile _ _LIGHT_LAYERS");
-            // pass.pragmas.Add("#pragma multi_compile _ _FORWARD_PLUS");
+            pass.pragmas.Add("#pragma multi_compile _ _CLUSTER_LIGHT_LOOP");
 #if UNITY_6000_0_OR_NEWER
             pass.pragmas.Add("#include_with_pragmas \"Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl\"");
 #endif

README.md

@@ -31,6 +31,7 @@
 ### PBR Features
 
 - Based on CoreRP, Google Filament, OpenPBR
+- Custom UnityCG include with various improvements
 - [Bakery](https://assetstore.unity.com/packages/tools/level-design/bakery-gpu-lightmapper-122218) Features (MonoSH, Lightmapped Specular, Bicubic Lightmap)
 - [LTCGI](https://github.com/PiMaker/ltcgi), [AreaLit](https://booth.pm/ja/items/3661829)
 - [Clustered BIRP](https://github.com/z3y/ClusteredBIRP)
@@ -68,7 +69,6 @@
 
 Currently not implemented:
 
-- Forward+
 - Dots
 - Decals
 - Rendering Layers

Runtime/UdonRPManager.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: UdonRPManager
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 91a33fc490acc0947b4ea3c1ce42ff76,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: e2cda85bcd88c3747903cf4e40f5e3c2,
     type: 2}
   udonAssembly: 
   assemblyError: 

ShaderLibrary/FragmentForwardPBR.hlsl

@@ -175,6 +175,13 @@ float4 frag(Varyings input) : SV_Target
     }
     #endif
 
+    #ifdef UNIVERSALRP
+        float2 normalizedScreenSpaceUV = GetNormalizedScreenSpaceUV(input.positionCS);
+    #else
+        // unused
+        float2 normalizedScreenSpaceUV = 0;
+    #endif
+
     half3 indirectSpecular = 0;
 #ifndef UNITY_PASS_FORWARDADD
 #if !defined(_GLOSSYREFLECTIONS_OFF) && !defined(_CBIRP_REFLECTIONS)
@@ -206,6 +213,12 @@ float4 frag(Varyings input) : SV_Target
     #ifdef UNIVERSALRP
         uint pixelLightCount = GetAdditionalLightsCount();
         uint meshRenderingLayers = GetMeshRenderingLayer();
+
+        // Unity expects hard coded variables in macros as usual.
+        InputData inputData = (InputData)0;
+        inputData.positionWS = positionWS;
+        inputData.normalizedScreenSpaceUV = normalizedScreenSpaceUV;
+
     LIGHT_LOOP_BEGIN(pixelLightCount)
         URPLight additionalURPLight = GetAdditionalLight(lightIndex, positionWS, SampleShadowMask(fragment.lightmapUV.xy));
 #ifdef _LIGHT_LAYERS

ShaderLibrary/GlobalIllumination/ReflectionProbe.hlsl

@@ -10,6 +10,10 @@
 #define ENABLE_ENVIRONMENT_PROBE
 #endif
 
+#ifdef _GLOSSYREFLECTIONS_OFF
+#define _ENVIRONMENTREFLECTIONS_OFF
+#endif
+
 TEXTURE2D(_DFG);
 SAMPLER(sampler_DFG);
 
@@ -76,10 +80,10 @@ half GetHorizonOcclusion(float3 reflectVector, float3 vertexNormalWS)
 
 half3 CalculateIrradianceFromReflectionProbes(half3 reflectVector, float3 positionWS, half perceptualRoughness, float2 normalizedScreenSpaceUV, float3 vertexNormalWS)
 {
-    half3 irradiance = half3(0.0h, 0.0h, 0.0h);
+    half3 irradiance = 0.0;
     half mip = PerceptualRoughnessToMipmapLevel(perceptualRoughness);
-#if USE_FORWARD_PLUS
-    float totalWeight = 0.0f;
+#if USE_CLUSTER_LIGHT_LOOP && CLUSTER_HAS_REFLECTION_PROBES
+    float totalWeight = 0.0;
     uint probeIndex;
     ClusterIterator it = ClusterInit(normalizedScreenSpaceUV, positionWS, 1);
     [loop] while (ClusterNext(it, probeIndex) && totalWeight < 0.99f)
@@ -192,7 +196,11 @@ half3 CalculateIrradianceFromReflectionProbes(half3 reflectVector, float3 positi
     // Use any remaining weight to blend to environment reflection cube map
     if (totalWeight < 0.99f)
     {
+        #ifdef UNIVERSALRP
+        half4 encodedIrradiance = half4(SAMPLE_TEXTURECUBE_LOD(_GlossyEnvironmentCubeMap, sampler_GlossyEnvironmentCubeMap, reflectVector, mip));
+        #else
         half4 encodedIrradiance = half4(SAMPLE_TEXTURECUBE_LOD(_GlossyEnvironmentCubeMap, samplerunity_SpecCube0, reflectVector, mip));
+        #endif
 
         irradiance += (1.0f - totalWeight) * DecodeHDREnvironment(encodedIrradiance, _GlossyEnvironmentCubeMap_HDR) * GetHorizonOcclusion(reflectVector, vertexNormalWS);
     }