check dead cache entry more eagerly

Author: al2me6

Source/DynamicProperties/MpbCompiler.cs

@@ -10,6 +10,8 @@ namespace Shabby.DynamicProperties;
 
 internal class MpbCompiler : IDisposable
 {
+	#region Fields
+
 	/// Immutable.
 	internal readonly SortedSet<Props> Cascade;
 
@@ -19,8 +21,13 @@ internal class MpbCompiler : IDisposable
 
 	private static readonly MaterialPropertyBlock EmptyMpb = new();
 
+	#endregion
+
 	internal MpbCompiler(SortedSet<Props> cascades)
 	{
+		MaterialPropertyManager.Instance?.LogDebug(
+			$"new cache entry {RuntimeHelpers.GetHashCode(this)}");
+
 		Cascade = cascades;
 		RebuildManagerMap();
 		RewriteMpb();
@@ -30,6 +37,8 @@ internal MpbCompiler(SortedSet<Props> cascades)
 		}
 	}
 
+	#region Renderer registration
+
 	internal void Register(Renderer renderer)
 	{
 		linkedRenderers.Add(renderer);
@@ -40,8 +49,21 @@ internal void Unregister(Renderer renderer)
 	{
 		linkedRenderers.Remove(renderer);
 		renderer.SetPropertyBlock(EmptyMpb);
+		CheckLiveness();
 	}
 
+	private void CheckLiveness()
+	{
+		if (linkedRenderers.Count > 0) return;
+		MaterialPropertyManager.Instance.LogDebug(
+			$"dead cache entry {RuntimeHelpers.GetHashCode(this)}");
+		PropsCascade.RemoveCacheEntry(this);
+	}
+
+	#endregion
+
+	#region Props updates
+
 	private void RebuildManagerMap()
 	{
 		idManagerMap.Clear();
@@ -65,16 +87,20 @@ private void RebuildManagerMap()
 	private void OnPropsValueChanged(Props props)
 	{
 		WriteMpb(props);
-		Apply();
+		ApplyAll();
 	}
 
 	private void OnPropsEntriesChanged(Props props)
 	{
 		RebuildManagerMap();
 		RewriteMpb();
-		Apply();
+		ApplyAll();
 	}
 
+	#endregion
+
+	#region Apply
+
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private void WriteMpb(Props props)
 	{
@@ -92,7 +118,7 @@ private void RewriteMpb()
 
 	private readonly List<Renderer> _deadRenderers = [];
 
-	internal void Apply()
+	private void ApplyAll()
 	{
 		foreach (var renderer in linkedRenderers) {
 			if (renderer == null) {
@@ -108,12 +134,13 @@ internal void Apply()
 			MaterialPropertyManager.Instance.Remove(dead);
 		}
 
-		if (linkedRenderers.Count == 0) {
-			MaterialPropertyManager.Instance.LogDebug("dead cache entry");
-			PropsCascade.RemoveCacheEntry(this);
-		}
+		CheckLiveness();
 	}
 
+	#endregion
+
+	#region dtor
+
 	private bool _disposed = false;
 
 	private void UnlinkProps()
@@ -140,4 +167,6 @@ public void Dispose()
 	{
 		UnlinkProps();
 	}
+
+	#endregion
 }

Source/DynamicProperties/PropsCascade.cs

@@ -45,8 +45,6 @@ private void ReacquireCompiler()
 		mpbCompiler?.Unregister(Renderer);
 
 		if (!MpbCache.TryGetValue(cascade, out mpbCompiler)) {
-			MaterialPropertyManager.Instance.LogDebug("building new cache entry");
-
 			// Don't accidentally mutate the cache key...
 			var clonedCascade = new SortedSet<Props>(cascade, Props.PriorityComparer);
 			mpbCompiler = new MpbCompiler(clonedCascade);