HDRenderPipeline: rename disableFptlWhenClustered to enableFptlForOpaqueWhenClustered

sebastienlagarde · sebastienlagarde · commit b5c11a9f7f78 · 2017-03-07T18:32:40.000+01:00
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TileLightLoopProducer.cs b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TileLightLoopProducer.cs
@@ -32,7 +32,7 @@ public class TileSettings
             // clustered light list specific buffers and data begin
             public int debugViewTilesFlags;
             public bool enableClustered;
-            public bool disableFptlWhenClustered; // still useful on opaques. Should be false by default to force tile on opaque.
+            public bool enableFptlForOpaqueWhenClustered; // still useful on opaques. Should be true by default to force tile on opaque.
             public bool enableBigTilePrepass;
 
             [Range(0.0f, 1.0f)]
@@ -48,7 +48,7 @@ public class TileSettings
 
                 debugViewTilesFlags = 0,
                 enableClustered = true,
-                disableFptlWhenClustered = false,
+                enableFptlForOpaqueWhenClustered = true,
                 enableBigTilePrepass = true,
             };
         }
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
@@ -282,7 +282,7 @@ bool usingFptl
                 {
                     bool isEnabledMSAA = false;
                     Debug.Assert(!isEnabledMSAA || m_PassSettings.enableClustered);
-                    bool disableFptl = (m_PassSettings.disableFptlWhenClustered && m_PassSettings.enableClustered) || isEnabledMSAA;
+                    bool disableFptl = (!m_PassSettings.enableFptlForOpaqueWhenClustered && m_PassSettings.enableClustered) || isEnabledMSAA;
                     return !disableFptl;
                 }
             }
diff --git a/Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePassProducer.asset b/Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePassProducer.asset
@@ -12,13 +12,13 @@ MonoBehaviour:
   m_Name: TilePassProducer
   m_EditorClassIdentifier: 
   m_TileSettings:
-    enableDrawLightBoundsDebug: 0
-    disableTileAndCluster: 0
-    disableDeferredShadingInCompute: 1
+    enableTileAndCluster: 1
     enableSplitLightEvaluation: 1
     enableComputeLightEvaluation: 0
     debugViewTilesFlags: 0
     enableClustered: 1
-    disableFptlWhenClustered: 0
+    enableFptlForOpaqueWhenClustered: 1
     enableBigTilePrepass: 1
+    diffuseGlobalDimmer: 1
+    specularGlobalDimmer: 1
   m_PassResources: {fileID: 11400000, guid: 7f2998544b2ac3848822b80ec3e6c446, type: 2}

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ bool usingFptl`
`282`	`282`	`{`
`283`	`283`	`bool isEnabledMSAA = false;`
`284`	`284`	`Debug.Assert(!isEnabledMSAA \|\| m_PassSettings.enableClustered);`
`285`		`- bool disableFptl = (m_PassSettings.disableFptlWhenClustered && m_PassSettings.enableClustered) \|\| isEnabledMSAA;`
	`285`	`+ bool disableFptl = (!m_PassSettings.enableFptlForOpaqueWhenClustered && m_PassSettings.enableClustered) \|\| isEnabledMSAA;`
`286`	`286`	`return !disableFptl;`
`287`	`287`	`}`
`288`	`288`	`}`