From b3810fc08c6a1cb7dc3bcb836a4dc85d43829fd8 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 22 Jul 2026 18:46:56 +0500
Subject: [PATCH] Fixed a bug with stale _usedCache value that wasn't reset
 properly (#21823)

---
 .../ServerCompositionVisual.Render.cs         |   7 ++-
 .../Avalonia.RenderTests/Media/EffectTests.cs |  52 +++++++++++++++++-
 ...CachedSiblingFollowedByEffect.expected.png | Bin 0 -> 2255 bytes
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 tests/TestFiles/Skia/Media/Effects/CachedSiblingFollowedByEffect.expected.png

diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.Render.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.Render.cs
index 8d8b862bb3..fe2b88e264 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.Render.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual/ServerCompositionVisual.Render.cs
@@ -192,7 +192,12 @@ partial class ServerCompositionVisual
                 if (visual.RenderOptions != default)
                     _canvas.PopRenderOptions();
             }
-            
+
+            // A cached visual is always a leaf in the walk (children are skipped), so its
+            // PreSubgraph/PostSubgraph are adjacent. Reset here so the flag never leaks into a
+            // later sibling and causes its effect/mask/options pushes to be left unpopped.
+            _usedCache = false;
+
             // If we are rendering to bitmap cache, PreSubgraph skipped those for the root visual
             if (!bitmapCacheRoot)
             {
diff --git a/tests/Avalonia.RenderTests/Media/EffectTests.cs b/tests/Avalonia.RenderTests/Media/EffectTests.cs
index c8b931dae8..d2c346c582 100644
--- a/tests/Avalonia.RenderTests/Media/EffectTests.cs
+++ b/tests/Avalonia.RenderTests/Media/EffectTests.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
+using Avalonia.Layout;
 using Avalonia.Media;
 using Xunit;
 #pragma warning disable CS0649
@@ -76,6 +77,55 @@ public class EffectTests : TestBase
         await RenderToFile(target);
         CompareImages(skipImmediate: true);
     }
-    
+
+    [Fact]
+    public async Task CachedSiblingFollowedByEffect()
+    {
+        var target = new Border
+        {
+            Background = Brushes.White,
+            Width = 200,
+            Height = 200,
+            Child = new StackPanel
+            {
+                Orientation = Orientation.Horizontal,
+                Spacing = 10,
+                Margin = new Thickness(15),
+                Children =
+                {
+                    new Rectangle
+                    {
+                        Width = 50,
+                        Height = 50,
+                        Fill = Brushes.Yellow,
+                        CacheMode = new BitmapCache()
+                    },
+                    new Rectangle
+                    {
+                        Width = 50,
+                        Height = 50,
+                        Fill = Brushes.Blue,
+                        Effect = new DropShadowEffect
+                        {
+                            Opacity = 1,
+                            OffsetX = 0,
+                            OffsetY = 0,
+                            Color = Colors.Black,
+                            BlurRadius = 20
+                        }
+                    },
+                    new Rectangle
+                    {
+                        Width = 50,
+                        Height = 50,
+                        Fill = Brushes.Green
+                    }
+                }
+            }
+        };
+
+        await RenderToFile(target);
+        CompareImages(skipImmediate: true);
+    }
 }
 #endif
diff --git a/tests/TestFiles/Skia/Media/Effects/CachedSiblingFollowedByEffect.expected.png b/tests/TestFiles/Skia/Media/Effects/CachedSiblingFollowedByEffect.expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c02b510a77e7ced83f3fe3c518654e902f77b38
GIT binary patch
literal 2255
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

literal 0
HcmV?d00001