Merge pull request #120 from Unity-Technologies/Enable-Cluster-rendering

Enable cluster rendering
8 年前 · 58e4eacd
--- a/Assets/ScriptableRenderLoop/HDRenderPipeline/Debug/Resources/DebugViewTiles.shader
+++ b/Assets/ScriptableRenderLoop/HDRenderPipeline/Debug/Resources/DebugViewTiles.shader
            #pragma vertex Vert
            #pragma fragment Frag

-            #define LIGHTLOOP_TILE_PASS 1            
-            #define LIGHTLOOP_TILE_ALL	1
+            #define LIGHTLOOP_TILE_PASS           
+            #define LIGHTLOOP_TILE_ALL

            #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST

--- a/Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/Forward.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/Forward.hlsl

 // Must match name in GetKeyword() method of forward lighting architecture .cs file
 // #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS -> can't use a pragma from include... (for now)
-// #pragma multi_compile SHADOWFILTERING_FIXED_SIZE_PCF  -> can't use a pragma from include... (for now)
+
+// No USE_FPTL_LIGHTLIST as we are in forward and this use the cluster path (but cluster path can use the tile light list for opaque)
+#define USE_CLUSTERED_LIGHTLIST
+#define LIGHTLOOP_TILE_ALL
--- a/Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/Resources/Deferred.shader
+++ b/Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/Resources/Deferred.shader

            // Chose supported lighting architecture in case of deferred rendering
            #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
-            //#pragma multi_compile SHADOWFILTERING_FIXED_SIZE_PCF 

            // TODO: Workflow problem here, I would like to only generate variant for the LIGHTLOOP_TILE_PASS case, not the LIGHTLOOP_SINGLE_PASS case. This must be on lightloop side and include here.... (Can we codition
            #pragma multi_compile LIGHTLOOP_TILE_DIRECT LIGHTLOOP_TILE_INDIRECT LIGHTLOOP_TILE_ALL
--- a/Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
+++ b/Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
            static int s_GenListPerBigTileKernel;

            public bool enableDrawLightBoundsDebug = false;
-            public bool disableTileAndCluster = true; // For debug / test
+            public bool disableTileAndCluster = false; // For debug / test
            public bool disableDeferredShadingInCompute = true;
            public bool enableSplitLightEvaluation = true;
            public bool enableComputeLightEvaluation = false;
-            public bool enableClustered = false;
-            public bool disableFptlWhenClustered = true;    // still useful on opaques. Should be false by default to force tile on opaque.
+            public bool enableClustered = true;
+            public bool disableFptlWhenClustered = false;    // still useful on opaques. Should be false by default to force tile on opaque.
            public bool enableBigTilePrepass = true;
            const bool k_UseDepthBuffer = true;      // only has an impact when EnableClustered is true (requires a depth-prepass)
            const bool k_UseAsyncCompute = true;        // should not use on mobile
                else
                {
                    cmd.name = useFptl ? "Forward Tiled pass" : "Forward Clustered pass";
+                    // say that we want to use tile of single loop
                    cmd.EnableShaderKeyword("LIGHTLOOP_TILE_PASS");
                    cmd.DisableShaderKeyword("LIGHTLOOP_SINGLE_PASS");
                    cmd.SetGlobalFloat("_UseTileLightList", useFptl ? 1 : 0);      // leaving this as a dynamic toggle for now for forward opaques to keep shader variants down.
--- a/Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePassLoop.hlsl
+++ b/Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePassLoop.hlsl
    return FetchIndexTile(tileOffset, lightIndex);
 }

-#else
+#elif defined(USE_CLUSTERED_LIGHTLIST)

 #include "ClusteredUtils.hlsl"

--- a/Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
+++ b/Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
            HLSLPROGRAM

            #define SHADERPASS SHADERPASS_FORWARD
+            #include "../../Lighting/Forward.hlsl"
-            // #include "../../Lighting/Forward.hlsl"
-            //#pragma multi_compile SHADOWFILTERING_FIXED_SIZE_PCF

            #include "../../Lighting/Lighting.hlsl"            
            #include "../Lit/ShaderPass/LitSharePass.hlsl"
--- a/Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader
+++ b/Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader
            #pragma domain Domain

            #define SHADERPASS SHADERPASS_FORWARD
+            #include "../../Lighting/Forward.hlsl"
-            // #include "../../Lighting/Forward.hlsl"
-            //#pragma multi_compile SHADOWFILTERING_FIXED_SIZE_PCF

            #include "../../Lighting/Lighting.hlsl"            
            #include "../Lit/ShaderPass/LitSharePass.hlsl"
--- a/Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/Lit.shader
+++ b/Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/Lit.shader
            HLSLPROGRAM

            #define SHADERPASS SHADERPASS_FORWARD
+            #include "../../Lighting/Forward.hlsl"
-            // #include "../../Lighting/Forward.hlsl"
-            //#pragma multi_compile SHADOWFILTERING_FIXED_SIZE_PCF

            #include "../../Lighting/Lighting.hlsl"
            #include "ShaderPass/LitSharePass.hlsl"
--- a/Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitTessellation.shader
+++ b/Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitTessellation.shader
            #pragma hull Hull
            #pragma domain Domain

-            #define SHADERPASS SHADERPASS_FORWARD
+            #define SHADERPASS SHADERPASS_FORWARD            
+            #include "../../Lighting/Forward.hlsl"
-            // #include "../../Lighting/Forward.hlsl"
-            //#pragma multi_compile SHADOWFILTERING_FIXED_SIZE_PCF

            #include "../../Lighting/Lighting.hlsl"
            #include "ShaderPass/LitSharePass.hlsl"
--- a/Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/CubeTransparent.mat
+++ b/Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/CubeTransparent.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: CubeTransparent
  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF
-    _EMISSION _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
+    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP_TANGENT_SPACE
+  m_EnableInstancingVariants: 0
+  disabledShaderPasses:
+  - DistortionVectors
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _BaseColorMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _DetailMask:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _DiffuseLightingMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _SubSurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _Anisotropy: 0
+    - _DepthOffsetEnable: 0
+    - _DetailAOScale: 1
+    - _DetailAlbedoScale: 1
+    - _DetailHeightScale: 1
+    - _DetailMapMode: 0
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionEnable: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
    - _HeightMapMode: 0
    - _HeightScale: 1
    - _MaterialId: 0
    - _Mode: 0
    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
    - _Parallax: 0.02
    - _Smoothness: 0.5
    - _SmoothnessTextureChannel: 0
    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _UVMappingPlanar: 0
+    - _ZTestMode: 8
    - _ZWrite: 0
    m_Colors:
    - _BaseColor: {r: 0.9117647, g: 0.1273789, b: 0.1273789, a: 0.566}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
--- a/Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/test-transparent.mat
+++ b/Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/test-transparent.mat
  m_PrefabInternal: {fileID: 0}
  m_Name: test-transparent
  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF
-    _EMISSION _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
+    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_EnableInstancingVariants: 0
+  disabledShaderPasses:
+  - DistortionVectors
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _AnisotropyMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _DetailMask:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _DiffuseMap:
        m_Texture: {fileID: 2800000, guid: d734753529ca78148a43944515a64bc5, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _EmissionMap:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _SubSurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:
    - _AlphaCutoff: 0.5
    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
    - _BlendMode: 0
    - _BumpScale: 1
    - _CoatCoverage: 0
+    - _DepthOffsetEnable: 0
+    - _DetailAOScale: 1
+    - _DetailAlbedoScale: 1
+    - _DetailHeightScale: 1
+    - _DetailMapMode: 0
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DistortionEnable: 0
    - _DistortionOnly: 0
    - _DoubleSided: 1
    - _DoubleSidedLigthing: 1
    - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
    - _HeightMapMode: 0
    - _HeightScale: 1
    - _MaterialID: 0
    - _Mettalic: 0
    - _Mode: 0
    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
    - _Parallax: 0.02
    - _Smoothness: 0.524
    - _SmoothnessTextureChannel: 0
    - _SubSurfaceRadius: 0
    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _UVMappingPlanar: 0
+    - _ZTestMode: 8
    - _ZWrite: 0
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 0.397}
    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.04, g: 0.04, b: 0.04, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}