From 5b382ae98567fcaa913b8d8f06f37da24639ad2a Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Tue, 6 Aug 2024 04:25:18 +0600
Subject: [PATCH] Added Compositor.CreateCompositionVisualSnapshot API (#16599)

* Added Compositor.CreateCompositionVisualSnapshot API

* Hurr durr api compat in [Unstable] interface

---------

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 api/Avalonia.Skia.nupkg.xml                   | 10 +++
 samples/ControlCatalog/Pages/OpenGlPage.xaml  |  5 +-
 .../ControlCatalog/Pages/OpenGlPage.xaml.cs   | 28 +++++++
 .../Platform/IDrawingContextImpl.cs           |  6 ++
 .../Platform/IPlatformRenderInterface.cs      |  8 ++
 src/Avalonia.Base/Platform/IScopedResource.cs | 44 +++++++++++
 .../Rendering/Composition/Compositor.cs       | 45 ++++++++---
 .../ServerCompositionContainerVisual.cs       |  7 +-
 .../Server/ServerCompositionDrawListVisual.cs | 10 +--
 ...verCompositionExperimentalAcrylicVisual.cs |  7 +-
 .../ServerCompositionSolidColorVisual.cs      |  5 +-
 .../Server/ServerCompositionSurfaceVisual.cs  |  5 +-
 .../ServerCompositionTarget.DirtyRects.cs     |  2 +-
 .../Server/ServerCompositionTarget.cs         |  5 +-
 .../Server/ServerCompositionVisual.cs         | 22 +++---
 .../Server/ServerCompositor.UserApis.cs       | 40 ++++++++++
 .../Composition/Server/ServerCompositor.cs    | 25 +++++--
 .../Server/ServerCustomCompositionVisual.cs   |  9 +--
 .../Server/ServerVisualRenderContext.cs       | 75 +++++++++++++++++++
 src/Avalonia.Controls/BorderVisual.cs         |  6 +-
 .../HeadlessPlatformRenderInterface.cs        |  3 +
 src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs        |  1 +
 .../Avalonia.Skia/Gpu/Metal/SkiaMetalGpu.cs   |  4 +
 .../Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs     |  2 +
 src/Skia/Avalonia.Skia/SkiaBackendContext.cs  | 22 ++++++
 src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs | 11 ++-
 .../Avalonia.Direct2D1/Direct2D1Platform.cs   |  4 +
 27 files changed, 349 insertions(+), 62 deletions(-)
 create mode 100644 api/Avalonia.Skia.nupkg.xml
 create mode 100644 src/Avalonia.Base/Platform/IScopedResource.cs
 create mode 100644 src/Avalonia.Base/Rendering/Composition/Server/ServerVisualRenderContext.cs

diff --git a/api/Avalonia.Skia.nupkg.xml b/api/Avalonia.Skia.nupkg.xml
new file mode 100644
index 0000000000..7abbc47cea
--- /dev/null
+++ b/api/Avalonia.Skia.nupkg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>M:Avalonia.Skia.ISkiaGpuWithPlatformGraphicsContext.TryGetGrContext</Target>
+    <Left>baseline/netstandard2.0/Avalonia.Skia.dll</Left>
+    <Right>target/netstandard2.0/Avalonia.Skia.dll</Right>
+  </Suppression>
+</Suppressions>
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml b/samples/ControlCatalog/Pages/OpenGlPage.xaml
index 2d1285566c..0e557cc1ad 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml
@@ -3,8 +3,11 @@
              x:Class="ControlCatalog.Pages.OpenGlPage"
              xmlns:pages="using:ControlCatalog.Pages"
              xmlns:openGl="clr-namespace:ControlCatalog.Pages.OpenGl">
-  <Grid>
+  <Grid x:Name="MainGrid">
     <pages:OpenGlPageControl x:Name="GL"/>
     <openGl:GlPageKnobs x:Name="Knobs" />
+    <Button x:Name="Snapshot"
+            IsVisible="False"
+            VerticalAlignment="Bottom" HorizontalAlignment="Right"  Click="SnapshotClick">Snapshot</Button>
   </Grid>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
index 28f4d7e073..f7a7e60f89 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
@@ -1,8 +1,12 @@
+using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.OpenGL;
 using Avalonia.OpenGL.Controls;
+using Avalonia.Rendering.Composition;
 using ControlCatalog.Pages.OpenGl;
 
 // ReSharper disable StringLiteralTypo
@@ -16,6 +20,30 @@ namespace ControlCatalog.Pages
             AvaloniaXamlLoader.Load(this);
             this.FindControl<OpenGlPageControl>("GL")
                 !.Init(this.FindControl<GlPageKnobs>("Knobs")!);
+            
+            AttachedToVisualTree += delegate
+            {
+                if (TopLevel.GetTopLevel(this) is Window)
+                    this.FindControl<Button>("Snapshot")!.IsVisible = true;
+            };
+        }
+        
+        private async void SnapshotClick(object sender, RoutedEventArgs e)
+        {
+            var v = ElementComposition.GetElementVisual(this)!;
+            var snap = await v.Compositor.CreateCompositionVisualSnapshot(v, 1.5);
+            await new Window()
+            {
+                Content = new ScrollViewer()
+                {
+                    HorizontalScrollBarVisibility = ScrollBarVisibility.Auto,
+                    VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
+                    Content = new Image()
+                    {
+                        Source = snap
+                    }
+                }
+            }.ShowDialog((Window)TopLevel.GetTopLevel(this));
         }
     }
 
diff --git a/src/Avalonia.Base/Platform/IDrawingContextImpl.cs b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
index 9621037cc1..476bca5a33 100644
--- a/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Base/Platform/IDrawingContextImpl.cs
@@ -229,4 +229,10 @@ namespace Avalonia.Platform
         /// </summary>
         bool CanBlit { get; }
     }
+
+    public interface IDrawingContextLayerWithRenderContextAffinityImpl : IDrawingContextLayerImpl
+    {
+        bool HasRenderContextAffinity { get; }
+        IBitmapImpl CreateNonAffinedSnapshot();
+    }
 }
diff --git a/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
index 0ead242a27..30b426489a 100644
--- a/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
+++ b/src/Avalonia.Base/Platform/IPlatformRenderInterface.cs
@@ -215,6 +215,14 @@ namespace Avalonia.Platform
         /// </param>
         /// <returns>An <see cref="IRenderTarget"/>.</returns>
         IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces);
+
+        /// <summary>
+        /// Creates an offscreen render target 
+        /// </summary>
+        /// <param name="pixelSize">The size, in pixels, of the render target</param>
+        /// <param name="scaling">The scaling which will be reported by IBitmap.Dpi</param>
+        /// <returns></returns>
+        IDrawingContextLayerImpl CreateOffscreenRenderTarget(PixelSize pixelSize, double scaling);
         
         /// <summary>
         /// Indicates that the context is no longer usable. This method should be thread-safe
diff --git a/src/Avalonia.Base/Platform/IScopedResource.cs b/src/Avalonia.Base/Platform/IScopedResource.cs
new file mode 100644
index 0000000000..616b211182
--- /dev/null
+++ b/src/Avalonia.Base/Platform/IScopedResource.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Threading;
+
+namespace Avalonia.Platform;
+
+public interface IScopedResource<T> : IDisposable
+{
+    public T Value { get; }
+}
+
+public class ScopedResource<T> : IScopedResource<T>
+{
+    private int _disposed = 0;
+    private T _value;
+    private Action? _dispose;
+    private ScopedResource(T value, Action dispose)
+    {
+        _value = value;
+        _dispose = dispose;
+    }
+    
+    public static IScopedResource<T> Create(T value, Action dispose) => new ScopedResource<T>(value, dispose);
+
+    public void Dispose()
+    {
+        if (Interlocked.CompareExchange(ref _disposed, 1, 0) == 0)
+        {
+            var disp = _dispose!;
+            _value = default!;
+            _dispose = null;
+            disp();
+        }
+    }
+
+    public T Value
+    {
+        get
+        {
+            if (_disposed == 1)
+                throw new ObjectDisposedException(this.GetType().FullName);
+            return _value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
index 48553d3b91..6b7a2ab081 100644
--- a/src/Avalonia.Base/Rendering/Composition/Compositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Compositor.cs
@@ -5,6 +5,7 @@ using Avalonia.Animation;
 using Avalonia.Animation.Easings;
 using Avalonia.Controls;
 using Avalonia.Media;
+using Avalonia.Media.Imaging;
 using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering.Composition.Server;
@@ -34,6 +35,7 @@ namespace Avalonia.Rendering.Composition
         private CompositionBatch? _pendingBatch;
         private readonly object _pendingBatchLock = new();
         private readonly List<Action> _pendingServerCompositorJobs = new();
+        private readonly List<Action> _pendingServerCompositorPostTargetJobs = new();
         private DiagnosticTextRenderer? _diagnosticTextRenderer;
         private readonly Action _triggerCommitRequested;
 
@@ -170,14 +172,23 @@ namespace Avalonia.Rendering.Composition
                     _disposeOnNextBatch.Clear();
                 }
 
-                if (_pendingServerCompositorJobs.Count > 0)
+                
+                static void SerializeServerJobs(BatchStreamWriter writer, List<Action> list, object startMarker, object endMarker)
                 {
-                    writer.WriteObject(ServerCompositor.RenderThreadJobsStartMarker);
-                    foreach (var job in _pendingServerCompositorJobs)
-                        writer.WriteObject(job);
-                    writer.WriteObject(ServerCompositor.RenderThreadJobsEndMarker);
+                    if (list.Count > 0)
+                    {
+                        writer.WriteObject(startMarker);
+                        foreach (var job in list)
+                            writer.WriteObject(job);
+                        writer.WriteObject(endMarker);
+                    }
+                    list.Clear();
                 }
-                _pendingServerCompositorJobs.Clear();
+
+                SerializeServerJobs(writer, _pendingServerCompositorJobs, ServerCompositor.RenderThreadJobsStartMarker,
+                    ServerCompositor.RenderThreadJobsEndMarker);
+                SerializeServerJobs(writer, _pendingServerCompositorPostTargetJobs, ServerCompositor.RenderThreadPostTargetJobsStartMarker,
+                    ServerCompositor.RenderThreadPostTargetJobsEndMarker);
             }
             
             _nextCommit.CommittedAt = Server.Clock.Elapsed;
@@ -227,21 +238,21 @@ namespace Avalonia.Rendering.Composition
             RequestCommitAsync();
         }
 
-        internal void PostServerJob(Action job)
+        internal void PostServerJob(Action job, bool postTarget = false)
         {
             Dispatcher.VerifyAccess();
-            _pendingServerCompositorJobs.Add(job);
+            (postTarget ? _pendingServerCompositorPostTargetJobs : _pendingServerCompositorJobs).Add(job);
             RequestCommitAsync();
         }
 
-        internal Task InvokeServerJobAsync(Action job) =>
+        internal Task InvokeServerJobAsync(Action job, bool postTarget = false) =>
             InvokeServerJobAsync<object?>(() =>
             {
                 job();
                 return null;
-            });
+            }, postTarget);
 
-        internal Task<T> InvokeServerJobAsync<T>(Func<T> job)
+        internal Task<T> InvokeServerJobAsync<T>(Func<T> job, bool postTarget = false)
         {
             var tcs = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
             PostServerJob(() =>
@@ -254,7 +265,7 @@ namespace Avalonia.Rendering.Composition
                 {
                     tcs.TrySetException(e);
                 }
-            });
+            }, postTarget);
             return tcs.Task;
         }
 
@@ -275,6 +286,16 @@ namespace Avalonia.Rendering.Composition
             (await GetRenderInterfacePublicFeatures().ConfigureAwait(false)).TryGetValue(featureType, out var rv);
             return rv;
         }
+
+        public async Task<Bitmap> CreateCompositionVisualSnapshot(CompositionVisual visual, double scaling)
+        {
+            if (visual.Compositor != this)
+                throw new InvalidOperationException();
+            if (visual.Root == null)
+                throw new InvalidOperationException();
+            var impl = await InvokeServerJobAsync(() => _server.CreateCompositionVisualSnapshot(visual.Server, scaling), true);
+            return new Bitmap(RefCountable.Create(impl));
+        }
         
         /// <summary>
         /// Attempts to query for GPU interop feature from the platform render interface
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
index 6071d7a5f2..69d317fff1 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionContainerVisual.cs
@@ -16,14 +16,13 @@ namespace Avalonia.Rendering.Composition.Server
         private LtrbRect? _transformedContentBounds;
         private IImmutableEffect? _oldEffect;
         
-        protected override void RenderCore(CompositorDrawingContextProxy canvas, LtrbRect currentTransformedClip,
-            IDirtyRectTracker dirtyRects)
+        protected override void RenderCore(ServerVisualRenderContext context, LtrbRect currentTransformedClip)
         {
-            base.RenderCore(canvas, currentTransformedClip, dirtyRects);
+            base.RenderCore(context, currentTransformedClip);
 
             foreach (var ch in Children)
             {
-                ch.Render(canvas, currentTransformedClip, dirtyRects);
+                ch.Render(context, currentTransformedClip);
             }
         }
 
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
index 3adf028438..ba9b042ad3 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs
@@ -40,17 +40,15 @@ internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisua
         base.DeserializeChangesCore(reader, committedAt);
     }
 
-    protected override void RenderCore(CompositorDrawingContextProxy canvas, LtrbRect currentTransformedClip,
-        IDirtyRectTracker dirtyRects)
+    protected override void RenderCore(ServerVisualRenderContext context, LtrbRect currentTransformedClip)
     {
         if (_renderCommands != null 
-            && currentTransformedClip.Intersects(TransformedOwnContentBounds)
-            && dirtyRects.Intersects(TransformedOwnContentBounds))
+            && context.ShouldRenderOwnContent(this, currentTransformedClip))
         {
-            _renderCommands.Render(canvas);
+            _renderCommands.Render(context.Canvas);
         }
 
-        base.RenderCore(canvas, currentTransformedClip, dirtyRects);
+        base.RenderCore(context, currentTransformedClip);
     }
     
     public void DependencyQueuedInvalidate(IServerRenderResource sender) => ValuesInvalidated();
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionExperimentalAcrylicVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionExperimentalAcrylicVisual.cs
index 20acf87d84..20a2501ca7 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionExperimentalAcrylicVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionExperimentalAcrylicVisual.cs
@@ -5,18 +5,17 @@ namespace Avalonia.Rendering.Composition.Server;
 
 internal partial class ServerCompositionExperimentalAcrylicVisual
 {
-    protected override void RenderCore(CompositorDrawingContextProxy canvas, LtrbRect currentTransformedClip,
-        IDirtyRectTracker dirtyRects)
+    protected override void RenderCore(ServerVisualRenderContext context, LtrbRect currentTransformedClip)
     {
         var cornerRadius = CornerRadius;
-        canvas.DrawRectangle(
+        context.Canvas.DrawRectangle(
             Material,
             new RoundedRect(
                 new Rect(0, 0, Size.X, Size.Y),
                 cornerRadius.TopLeft, cornerRadius.TopRight,
                 cornerRadius.BottomRight, cornerRadius.BottomLeft));
 
-        base.RenderCore(canvas, currentTransformedClip, dirtyRects);
+        base.RenderCore(context, currentTransformedClip);
     }
 
     public override LtrbRect OwnContentBounds => new(0, 0, Size.X, Size.Y);
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSolidColorVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSolidColorVisual.cs
index e38ae57c57..a494692021 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSolidColorVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSolidColorVisual.cs
@@ -5,9 +5,8 @@ namespace Avalonia.Rendering.Composition.Server;
 
 internal partial class ServerCompositionSolidColorVisual
 {
-    protected override void RenderCore(CompositorDrawingContextProxy canvas, LtrbRect currentTransformedClip,
-        IDirtyRectTracker dirtyRects)
+    protected override void RenderCore(ServerVisualRenderContext context, LtrbRect currentTransformedClip)
     {
-        canvas.DrawRectangle(new ImmutableSolidColorBrush(Color), null, new Rect(0, 0, Size.X, Size.Y));
+        context.Canvas.DrawRectangle(new ImmutableSolidColorBrush(Color), null, new Rect(0, 0, Size.X, Size.Y));
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurfaceVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurfaceVisual.cs
index d4b1662bd9..28663ce342 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurfaceVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionSurfaceVisual.cs
@@ -5,8 +5,7 @@ namespace Avalonia.Rendering.Composition.Server;
 
 internal partial class ServerCompositionSurfaceVisual
 {
-    protected override void RenderCore(CompositorDrawingContextProxy canvas, LtrbRect currentTransformedClip,
-        IDirtyRectTracker dirtyRects)
+    protected override void RenderCore(ServerVisualRenderContext context, LtrbRect currentTransformedClip)
     {
         if (Surface == null)
             return;
@@ -15,7 +14,7 @@ internal partial class ServerCompositionSurfaceVisual
         var bmp = Surface.Bitmap.Item;
 
         //TODO: add a way to always render the whole bitmap instead of just assuming 96 DPI
-        canvas.DrawBitmap(Surface.Bitmap.Item, 1, new Rect(bmp.PixelSize.ToSize(1)), new Rect(
+        context.Canvas.DrawBitmap(Surface.Bitmap.Item, 1, new Rect(bmp.PixelSize.ToSize(1)), new Rect(
             new Size(Size.X, Size.Y)));
     }
 
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.DirtyRects.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.DirtyRects.cs
index d82502fc3c..1b5cac520e 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.DirtyRects.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.DirtyRects.cs
@@ -35,7 +35,7 @@ internal partial class ServerCompositionTarget
     public Rect SnapToDevicePixels(Rect rect) => SnapToDevicePixels(new(rect), Scaling).ToRect();
     public LtrbRect SnapToDevicePixels(LtrbRect rect) => SnapToDevicePixels(rect, Scaling);
         
-    private static LtrbRect SnapToDevicePixels(LtrbRect rect, double scale)
+    public static LtrbRect SnapToDevicePixels(LtrbRect rect, double scale)
     {
         return new LtrbRect(
             Math.Floor(rect.Left * scale) / scale,
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index 73d9b89504..8afdb6a2cc 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -214,7 +214,10 @@ namespace Avalonia.Rendering.Composition.Server
                     context.PushLayer(DirtyRects.CombinedRect.ToRectUnscaled());
 
                 using (var proxy = new CompositorDrawingContextProxy(context))
-                    root.Render(proxy, null, DirtyRects);
+                {
+                    var ctx = new ServerVisualRenderContext(proxy, DirtyRects, false);
+                    root.Render(ctx, null);
+                }
 
                 if (useLayerClip)
                     context.PopLayer();
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
index ccc4b658be..54848d885d 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs
@@ -22,24 +22,22 @@ namespace Avalonia.Rendering.Composition.Server
         private LtrbRect? _transformedClipBounds;
         private LtrbRect _combinedTransformedClipBounds;
 
-        protected virtual void RenderCore(CompositorDrawingContextProxy canvas, LtrbRect currentTransformedClip,
-            IDirtyRectTracker dirtyRects)
+        protected virtual void RenderCore(ServerVisualRenderContext canvas, LtrbRect currentTransformedClip)
         {
         }
 
-        public void Render(CompositorDrawingContextProxy canvas, LtrbRect? parentTransformedClip, IDirtyRectTracker dirtyRects)
+        public void Render(ServerVisualRenderContext context, LtrbRect? parentTransformedClip)
         {
             if (Visible == false || IsVisibleInFrame == false)
                 return;
             if (Opacity == 0)
                 return;
-
+            var canvas = context.Canvas;
+            
             var currentTransformedClip = parentTransformedClip.HasValue
                 ? parentTransformedClip.Value.Intersect(_combinedTransformedClipBounds)
                 : _combinedTransformedClipBounds;
-            if (currentTransformedClip.IsZeroSize)
-                return;
-            if(!dirtyRects.Intersects(currentTransformedClip))
+            if(!context.ShouldRender(this, currentTransformedClip))
                 return;
 
             Root!.RenderedVisuals++;
@@ -49,12 +47,16 @@ namespace Avalonia.Rendering.Composition.Server
 
             if (AdornedVisual != null)
             {
+                // Adorners are currently not supported in detached rendering mode
+                if(context.DetachedRendering)
+                    return;
+                
                 canvas.Transform = Matrix.Identity;
                 if (AdornerIsClipped)
                     canvas.PushClip(AdornedVisual._combinedTransformedClipBounds.ToRect());
             }
-            var transform = GlobalTransformMatrix;
-            canvas.Transform = transform;
+
+            using var _ = context.SetOrPushTransform(this);
 
             var applyRenderOptions = RenderOptions != default;
 
@@ -72,7 +74,7 @@ namespace Avalonia.Rendering.Composition.Server
             if (OpacityMaskBrush != null)
                 canvas.PushOpacityMask(OpacityMaskBrush, boundsRect);
 
-            RenderCore(canvas, currentTransformedClip, dirtyRects);
+            RenderCore(context, currentTransformedClip);
             
             if (OpacityMaskBrush != null)
                 canvas.PopOpacityMask();
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.UserApis.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.UserApis.cs
index bbdea64004..7d203a7c47 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.UserApis.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.UserApis.cs
@@ -47,4 +47,44 @@ internal partial class ServerCompositor
         lock (_renderInterfaceFeaturesUserApiLock)
             return _renderInterfaceFeatureCache ??= RenderInterface.Value.PublicFeatures;
     }
+
+    public IBitmapImpl CreateCompositionVisualSnapshot(ServerCompositionVisual visual,
+        double scaling)
+    {
+        using (RenderInterface.EnsureCurrent())
+        {
+            var pixelSize = PixelSize.FromSize(new Size(visual.Size.X, visual.Size.Y), scaling);
+            
+            var scaleTransform = Matrix.CreateScale(scaling, scaling);
+            var invertRootTransform = visual.CombinedTransformMatrix.Invert();
+
+            IDrawingContextLayerImpl? target = null;
+            try
+            {
+                target = RenderInterface.Value.CreateOffscreenRenderTarget(pixelSize, scaling);
+                using (var canvas = target.CreateDrawingContext(false))
+                {
+                    var proxy = new CompositorDrawingContextProxy(canvas)
+                    {
+                        PostTransform = invertRootTransform * scaleTransform,
+                        Transform = Matrix.Identity
+                    };
+                    var ctx = new ServerVisualRenderContext(proxy, null, true);
+                    visual.Render(ctx, null);
+                }
+
+                if (target is IDrawingContextLayerWithRenderContextAffinityImpl affined)
+                    return affined.CreateNonAffinedSnapshot();
+                
+                // We are returning the original target, so prevent it from being disposed
+                var rv = target;
+                target = null;
+                return rv;
+            }
+            finally
+            {
+                target?.Dispose();
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
index a25c958e4f..dd540ecf9f 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositor.cs
@@ -23,6 +23,7 @@ namespace Avalonia.Rendering.Composition.Server
 
         private readonly Queue<CompositionBatch> _batches = new Queue<CompositionBatch>();
         private readonly Queue<Action> _receivedJobQueue = new();
+        private readonly Queue<Action> _receivedPostTargetJobQueue = new();
         public long LastBatchId { get; private set; }
         public Stopwatch Clock { get; } = Stopwatch.StartNew();
         public TimeSpan ServerNow { get; private set; }
@@ -36,6 +37,8 @@ namespace Avalonia.Rendering.Composition.Server
         internal static readonly object RenderThreadDisposeStartMarker = new();
         internal static readonly object RenderThreadJobsStartMarker = new();
         internal static readonly object RenderThreadJobsEndMarker = new();
+        internal static readonly object RenderThreadPostTargetJobsStartMarker = new();
+        internal static readonly object RenderThreadPostTargetJobsEndMarker = new();
         public CompositionOptions Options { get; }
         public ServerCompositorAnimations Animations { get; }
 
@@ -83,7 +86,12 @@ namespace Avalonia.Rendering.Composition.Server
                         var readObject = stream.ReadObject();
                         if (readObject == RenderThreadJobsStartMarker)
                         {
-                            ReadServerJobs(stream);
+                            ReadServerJobs(stream, _receivedJobQueue, RenderThreadJobsEndMarker);
+                            continue;
+                        }
+                        if (readObject == RenderThreadPostTargetJobsStartMarker)
+                        {
+                            ReadServerJobs(stream, _receivedPostTargetJobQueue, RenderThreadPostTargetJobsEndMarker);
                             continue;
                         }
 
@@ -111,11 +119,11 @@ namespace Avalonia.Rendering.Composition.Server
             }
         }
 
-        void ReadServerJobs(BatchStreamReader reader)
+        void ReadServerJobs(BatchStreamReader reader, Queue<Action> queue, object endMarker)
         {
             object? readObject;
-            while ((readObject = reader.ReadObject()) != RenderThreadJobsEndMarker)
-                _receivedJobQueue.Enqueue((Action)readObject!);
+            while ((readObject = reader.ReadObject()) != endMarker)
+                queue.Enqueue((Action)readObject!);
         }
 
         void ReadDisposeJobs(BatchStreamReader reader)
@@ -128,12 +136,12 @@ namespace Avalonia.Rendering.Composition.Server
             }
         }
 
-        void ExecuteServerJobs()
+        void ExecuteServerJobs(Queue<Action> queue)
         {
-            while(_receivedJobQueue.Count > 0)
+            while(queue.Count > 0)
                 try
                 {
-                    _receivedJobQueue.Dequeue()();
+                    queue.Dequeue()();
                 }
                 catch
                 {
@@ -221,9 +229,10 @@ namespace Avalonia.Rendering.Composition.Server
                 if(!RenderInterface.IsReady)
                     return;
                 RenderInterface.EnsureValidBackendContext();
-                ExecuteServerJobs();
+                ExecuteServerJobs(_receivedJobQueue);
                 foreach (var t in _activeTargets)
                     t.Render();
+                ExecuteServerJobs(_receivedPostTargetJobQueue);
             }
             catch (Exception e) when(RT_OnContextLostExceptionFilterObserver(e) && catchExceptions)
             {
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCustomCompositionVisual.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCustomCompositionVisual.cs
index 203a530c9b..8ba5470e7f 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCustomCompositionVisual.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCustomCompositionVisual.cs
@@ -71,11 +71,10 @@ internal sealed class ServerCompositionCustomVisual : ServerCompositionContainer
             Compositor.Animations.AddToClock(this);
     }
 
-    protected override void RenderCore(CompositorDrawingContextProxy canvas, LtrbRect currentTransformedClip,
-        IDirtyRectTracker dirtyRects)
+    protected override void RenderCore(ServerVisualRenderContext ctx, LtrbRect currentTransformedClip)
     {
-        canvas.AutoFlush = true;
-        using var context = new ImmediateDrawingContext(canvas, GlobalTransformMatrix, false);
+        ctx.Canvas.AutoFlush = true;
+        using var context = new ImmediateDrawingContext(ctx.Canvas, GlobalTransformMatrix, false);
         try
         {
             _handler.Render(context, currentTransformedClip.ToRect());
@@ -86,6 +85,6 @@ internal sealed class ServerCompositionCustomVisual : ServerCompositionContainer
                 ?.Log(_handler, $"Exception in {_handler.GetType().Name}.{nameof(CompositionCustomVisualHandler.OnRender)} {{0}}", e);
         }
 
-        canvas.AutoFlush = false;
+        ctx.Canvas.AutoFlush = false;
     }
 }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerVisualRenderContext.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerVisualRenderContext.cs
new file mode 100644
index 0000000000..0778a7a621
--- /dev/null
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerVisualRenderContext.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Platform;
+
+namespace Avalonia.Rendering.Composition.Server;
+
+internal class ServerVisualRenderContext
+{
+    public IDirtyRectTracker? DirtyRects { get; }
+    public bool DetachedRendering { get; }
+    public CompositorDrawingContextProxy Canvas { get; }
+    private readonly Stack<Matrix>? _transformStack;
+
+    public ServerVisualRenderContext(CompositorDrawingContextProxy canvas, IDirtyRectTracker? dirtyRects,
+        bool detachedRendering)
+    {
+        Canvas = canvas;
+        DirtyRects = dirtyRects;
+        DetachedRendering = detachedRendering;
+        if (detachedRendering)
+        {
+            _transformStack = new();
+            _transformStack.Push(canvas.Transform);
+        }
+    }
+
+
+    public bool ShouldRender(ServerCompositionVisual visual, LtrbRect currentTransformedClip)
+    {
+        if (DetachedRendering)
+            return true;
+        if (currentTransformedClip.IsZeroSize)
+            return false;
+        if (DirtyRects?.Intersects(currentTransformedClip) == false)
+            return false;
+        return true;
+    }
+
+    public bool ShouldRenderOwnContent(ServerCompositionVisual visual, LtrbRect currentTransformedClip)
+    {
+        if (DetachedRendering)
+            return true;
+        return currentTransformedClip.Intersects(visual.TransformedOwnContentBounds)
+               && DirtyRects?.Intersects(visual.TransformedOwnContentBounds) != false;
+    }
+
+    public RestoreTransform SetOrPushTransform(ServerCompositionVisual visual)
+    {
+        if (!DetachedRendering)
+        {
+            Canvas.Transform = visual.GlobalTransformMatrix;
+            return default;
+        }
+        else
+        {
+            var transform = visual.CombinedTransformMatrix * _transformStack!.Peek();
+            Canvas.Transform = transform;
+            _transformStack.Push(transform);
+            return new RestoreTransform(this);
+        }
+    }
+
+    public struct RestoreTransform(ServerVisualRenderContext? parent) : IDisposable
+    {
+        public void Dispose()
+        {
+            if (parent != null)
+            {
+                parent._transformStack!.Pop();
+                parent.Canvas.Transform = parent._transformStack.Peek();
+            }
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/BorderVisual.cs b/src/Avalonia.Controls/BorderVisual.cs
index 36a557d5ed..3046e7e875 100644
--- a/src/Avalonia.Controls/BorderVisual.cs
+++ b/src/Avalonia.Controls/BorderVisual.cs
@@ -46,9 +46,9 @@ class CompositionBorderVisual : CompositionDrawListVisual
         {
         }
 
-        protected override void RenderCore(CompositorDrawingContextProxy canvas, LtrbRect currentTransformedClip,
-            IDirtyRectTracker dirtyRects)
+        protected override void RenderCore(ServerVisualRenderContext ctx, LtrbRect currentTransformedClip)
         {
+            var canvas = ctx.Canvas;
             if (ClipToBounds)
             {
                 var clipRect = Root!.SnapToDevicePixels(new Rect(new Size(Size.X, Size.Y)));
@@ -58,7 +58,7 @@ class CompositionBorderVisual : CompositionDrawListVisual
                     canvas.PushClip(new RoundedRect(clipRect, _cornerRadius));
             }
 
-            base.RenderCore(canvas, currentTransformedClip, dirtyRects);
+            base.RenderCore(ctx, currentTransformedClip);
             
             if(ClipToBounds)
                 canvas.PopClip();
diff --git a/src/Headless/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Headless/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
index 7c7eea1c6f..d018ef491f 100644
--- a/src/Headless/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
+++ b/src/Headless/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
@@ -61,6 +61,9 @@ namespace Avalonia.Headless
             => new HeadlessGeometryStub(g1.Bounds.Union(g2.Bounds));
 
         public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces) => new HeadlessRenderTarget();
+        public IDrawingContextLayerImpl CreateOffscreenRenderTarget(PixelSize pixelSize, double scaling) => 
+            new HeadlessBitmapStub(pixelSize, new Vector(96 * scaling, 96 * scaling));
+
         public bool IsLost => false;
         public IReadOnlyDictionary<Type, object> PublicFeatures { get; } = new Dictionary<Type, object>();
         public object? TryGetFeature(Type featureType) => null;
diff --git a/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
index 20e7adb334..85a2cbdd22 100644
--- a/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs
@@ -31,6 +31,7 @@ namespace Avalonia.Skia
     public interface ISkiaGpuWithPlatformGraphicsContext : ISkiaGpu
     {
         IPlatformGraphicsContext? PlatformGraphicsContext { get; }
+        IScopedResource<GRContext>? TryGetGrContext();
     }
     
     public interface ISkiaSurface : IDisposable
diff --git a/src/Skia/Avalonia.Skia/Gpu/Metal/SkiaMetalGpu.cs b/src/Skia/Avalonia.Skia/Gpu/Metal/SkiaMetalGpu.cs
index 8e5573a465..bfd6e1aa59 100644
--- a/src/Skia/Avalonia.Skia/Gpu/Metal/SkiaMetalGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/Metal/SkiaMetalGpu.cs
@@ -34,6 +34,10 @@ internal class SkiaMetalGpu : ISkiaGpu, ISkiaGpuWithPlatformGraphicsContext
     public IDisposable EnsureCurrent() => _device.EnsureCurrent();
     public IPlatformGraphicsContext? PlatformGraphicsContext => _device;
 
+    public IScopedResource<GRContext> TryGetGrContext() =>
+        ScopedResource<GRContext>.Create(_context ?? throw new ObjectDisposedException(nameof(SkiaMetalApi)),
+            EnsureCurrent().Dispose);
+
     public ISkiaGpuRenderTarget? TryCreateRenderTarget(IEnumerable<object> surfaces)
     {
         foreach (var surface in surfaces)
diff --git a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
index a44ebc1e39..d87ff52c2e 100644
--- a/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
+++ b/src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs
@@ -164,6 +164,8 @@ namespace Avalonia.Skia
         public bool IsLost => _glContext.IsLost;
         public IDisposable EnsureCurrent() => _glContext.EnsureCurrent();
         public IPlatformGraphicsContext? PlatformGraphicsContext => _glContext;
+        public IScopedResource<GRContext> TryGetGrContext() =>
+            ScopedResource<GRContext>.Create(GrContext, EnsureCurrent().Dispose);
 
         public object? TryGetFeature(Type featureType)
         {
diff --git a/src/Skia/Avalonia.Skia/SkiaBackendContext.cs b/src/Skia/Avalonia.Skia/SkiaBackendContext.cs
index 555c564f4a..db50c1e424 100644
--- a/src/Skia/Avalonia.Skia/SkiaBackendContext.cs
+++ b/src/Skia/Avalonia.Skia/SkiaBackendContext.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.OpenGL;
 using Avalonia.Platform;
+using SkiaSharp;
 
 namespace Avalonia.Skia;
 
@@ -60,6 +61,27 @@ internal class SkiaContext : IPlatformRenderInterfaceContext
             "Don't know how to create a Skia render target from any of provided surfaces");
     }
 
+    public IDrawingContextLayerImpl CreateOffscreenRenderTarget(PixelSize pixelSize, double scaling)
+    {
+        using (var gr = (_gpu as ISkiaGpuWithPlatformGraphicsContext)?.TryGetGrContext())
+        {
+            var createInfo = new SurfaceRenderTarget.CreateInfo
+            {
+                Width = pixelSize.Width,
+                Height = pixelSize.Height,
+                Dpi = new Vector(96 * scaling, 96 * scaling),
+                Format = null,
+                DisableTextLcdRendering = false,
+                GrContext = gr?.Value,
+                Gpu = _gpu,
+                DisableManualFbo = true,
+                Session = null
+            };
+
+            return new SurfaceRenderTarget(createInfo);
+        }
+    }
+
     public bool IsLost => _gpu?.IsLost ?? false;
     public IReadOnlyDictionary<Type, object> PublicFeatures { get; }
 
diff --git a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
index 9b5d104aad..27e36d99b3 100644
--- a/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
+++ b/src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Skia
     /// <summary>
     /// Skia render target that writes to a surface.
     /// </summary>
-    internal class SurfaceRenderTarget : IDrawingContextLayerImpl, IDrawableBitmapImpl
+    internal class SurfaceRenderTarget : IDrawingContextLayerImpl, IDrawableBitmapImpl, IDrawingContextLayerWithRenderContextAffinityImpl
     {
         private readonly ISkiaSurface _surface;
         private readonly SKCanvas _canvas;
@@ -234,5 +234,14 @@ namespace Avalonia.Skia
 
             public bool DisableManualFbo;
         }
+
+        public bool HasRenderContextAffinity => _grContext != null;
+        public IBitmapImpl CreateNonAffinedSnapshot()
+        {
+            if (!HasRenderContextAffinity)
+                throw new InvalidOperationException();
+            using var image = SnapshotImage();
+            return new ImmutableBitmap(image.ToRasterImage(true));
+        }
     }
 }
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index 1b609af5d9..e3aa990f14 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -179,6 +179,10 @@ namespace Avalonia.Direct2D1
             }
 
             public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces) => _platform.CreateRenderTarget(surfaces);
+
+            public IDrawingContextLayerImpl CreateOffscreenRenderTarget(PixelSize pixelSize, double scaling) =>
+                new WicRenderTargetBitmapImpl(pixelSize, new Vector(96 * scaling, 96 * scaling));
+
             public bool IsLost => false;
             public IReadOnlyDictionary<Type, object> PublicFeatures { get; } = new Dictionary<Type, object>();
         }