fix: remove global cache

mob-sakai · Nov 14, 2023 · c33f2f6 · c33f2f6
1 parent 3c85252
commit c33f2f6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 29 deletions.
diff --git a/Packages/src/Runtime/CompositeCanvasRenderer.cs b/Packages/src/Runtime/CompositeCanvasRenderer.cs
@@ -621,9 +621,7 @@ public override Material GetModifiedMaterial(Material baseMaterial)
  Profiler.BeginSample("(CCR)[CompositeCanvasRenderer] GetModifiedMaterial > Get material");
  var hash = CreateHash(colorMode, srcBlendMode, dstBlendMode);
  _createMaterial = _createMaterial ?? CreateMaterial;
- MaterialRegistry.Get(hash, ref _renderingMaterial,
- _createMaterial,
- CompositeCanvasRendererProjectSettings.cacheRendererMaterial);
+ MaterialRegistry.Get(hash, ref _renderingMaterial, _createMaterial);
  Profiler.EndSample();
 
  return _renderingMaterial;

diff --git a/Packages/src/Runtime/CompositeCanvasSource.cs b/Packages/src/Runtime/CompositeCanvasSource.cs
@@ -257,24 +257,8 @@ void IMeshModifier.ModifyMesh(VertexHelper verts)
  _mesh.RecalculateBounds();
  Profiler.EndSample();
  Logging.Log(this, " >>>> Graphic mesh is modified.");
- }
-
- public static int Compare(CompositeCanvasSource l, CompositeCanvasSource r)
- {
- if (l == r) return 0;
- if ((!l || !l._graphic) && (r && r._graphic)) return -1;
- if (l && l._graphic && (!r || !r._graphic)) return 1;
 
- Profiler.BeginSample("(CCR)[CompositeCanvasSource] Compare > depth");
- var lDepth = l._graphic ? l._graphic.depth : -1;
- var rDepth = r._graphic ? r._graphic.depth : -1;
- Profiler.EndSample();
- if (lDepth != -1 && rDepth != -1) return lDepth - rDepth;
-
- Profiler.BeginSample("(CCR)[CompositeCanvasSource] Compare > CompareHierarchyIndex");
- var compare = l.transform.CompareHierarchyIndex(r.transform, l._renderer ? l._renderer.transform : null);
- Profiler.EndSample();
- return compare;
+ SetRendererDirty();
  }
 
  /// <summary>
@@ -337,7 +321,7 @@ private void SetRendererDirty()
 
  internal void Bake(CommandBuffer cb, bool usePopMaterial)
  {
- if (!_graphic || !_graphic.canvasRenderer || !IsInScreen()) return;
+ if (!_graphic || !_graphic.isActiveAndEnabled || !_graphic.canvasRenderer || !IsInScreen()) return;
  var cr = _graphic.canvasRenderer;
  if (usePopMaterial && cr.popMaterialCount == 0) return;
 

diff --git a/Packages/src/Runtime/Effects/CompositeCanvasBlur.cs b/Packages/src/Runtime/Effects/CompositeCanvasBlur.cs
@@ -131,7 +131,7 @@ public override void ApplyBakedEffect(CommandBuffer cb)
  () => new Material(Shader.Find("Hidden/UI/CompositeCanvasRenderer/Blur"))
  {
  hideFlags = HideFlags.DontSave | HideFlags.NotEditable
- }, CompositeCanvasRendererProjectSettings.cacheRendererMaterial);
+ });
  Profiler.EndSample();
 
  var scale = w / compositeCanvasRenderer.renderingSize.x;

diff --git a/Packages/src/Runtime/ProjectSettings/CompositeCanvasRendererProjectSettings.cs b/Packages/src/Runtime/ProjectSettings/CompositeCanvasRendererProjectSettings.cs
@@ -11,17 +11,12 @@ public class CompositeCanvasRendererProjectSettings
  [SerializeField]
  private TransformSensitivity m_TransformSensitivity = TransformSensitivity.Medium;
 
- [SerializeField]
- private bool m_CacheRendererMaterial = true;
-
 #if UNITY_EDITOR
  [Header("Shader")]
  [SerializeField]
  private bool m_AutoIncludeShaders = true;
 #endif
 
- public static bool cacheRendererMaterial => instance.m_CacheRendererMaterial;
-
  public static TransformSensitivity transformSensitivity
  {
  get => instance.m_TransformSensitivity;

diff --git a/Packages/src/Runtime/Utilities/MaterialRegistry.cs b/Packages/src/Runtime/Utilities/MaterialRegistry.cs
@@ -33,7 +33,7 @@ private static void Clear()
  /// <summary>
  /// Adds or retrieves a cached material based on the hash.
  /// </summary>
- public static void Get(Hash128 hash, ref Material material, Func<Material> onCreate, bool globalCache = false)
+ public static void Get(Hash128 hash, ref Material material, Func<Material> onCreate)
  {
  // Find existing entry.
  Profiler.BeginSample("(CCR)[MaterialRegistry] Get > Find existing entry");
@@ -64,7 +64,7 @@ public static void Get(Hash128 hash, ref Material material, Func<Material> onCre
  var entry = s_MatEntryPool.Rent();
  entry.customMat = onCreate();
  entry.hash = hash;
- entry.count = globalCache ? 2 : 1;
+ entry.count = 1;
  s_List.Add(entry);
  Logging.Log(typeof(MaterialRegistry),
  $"Get(#{s_List.Count}): {entry.hash.GetHashCode()}, {entry.customMat.shader}");