From 2f34c124e6d136c5a1be2507f116f14580c84d63 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 3 Jun 2017 05:03:08 +0300 Subject: [PATCH 1/2] Added Direct2D-specific IExternalDirect2DRenderTargetSurface --- .../Avalonia.Direct2D1.csproj | 2 + .../Avalonia.Direct2D1/Direct2D1Platform.cs | 5 ++ .../ExternalRenderTarget.cs | 50 +++++++++++++++++++ .../IExternalDirect2DRenderTargetSurface.cs | 15 ++++++ .../Media/DrawingContextImpl.cs | 7 ++- 5 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs create mode 100644 src/Windows/Avalonia.Direct2D1/IExternalDirect2DRenderTargetSurface.cs diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj index ab62f5ac75..cf5a055df8 100644 --- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj +++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj @@ -50,7 +50,9 @@ + + diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs index 469c29d626..c2bf019ee6 100644 --- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs +++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs @@ -141,6 +141,11 @@ namespace Avalonia.Direct2D1 if(nativeWindow.HandleDescriptor != "HWND") throw new NotSupportedException("Don't know how to create a Direct2D1 renderer from " + nativeWindow.HandleDescriptor); return new HwndRenderTarget(nativeWindow); + } + var external = surfaces?.OfType(); + if (external != null) + { + } throw new NotSupportedException("Don't know how to create a Direct2D1 renderer from any of provided surfaces"); } diff --git a/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs new file mode 100644 index 0000000000..b1c0e7e30a --- /dev/null +++ b/src/Windows/Avalonia.Direct2D1/ExternalRenderTarget.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Avalonia.Direct2D1.Media; +using Avalonia.Platform; +using Avalonia.Rendering; +using SharpDX; +using DirectWriteFactory = SharpDX.DirectWrite.Factory; + +namespace Avalonia.Direct2D1 +{ + class ExternalRenderTarget : IRenderTarget + { + private readonly IExternalDirect2DRenderTargetSurface _externalRenderTargetProvider; + private readonly DirectWriteFactory _dwFactory; + private SharpDX.Direct2D1.RenderTarget _target; + public ExternalRenderTarget(IExternalDirect2DRenderTargetSurface externalRenderTargetProvider, + DirectWriteFactory dwFactory) + { + _externalRenderTargetProvider = externalRenderTargetProvider; + _dwFactory = dwFactory; + } + + public void Dispose() + { + _target?.Dispose(); + _target = null; + } + + public IDrawingContextImpl CreateDrawingContext(IVisualBrushRenderer visualBrushRenderer) + { + _target = _target ?? _externalRenderTargetProvider.CreateRenderTarget(); + _externalRenderTargetProvider.BeforeDrawing(); + return new DrawingContextImpl(visualBrushRenderer, _target, _dwFactory, null, () => + { + try + { + _externalRenderTargetProvider.AfterDrawing(); + } + catch (SharpDXException ex) when ((uint) ex.HResult == 0x8899000C) // D2DERR_RECREATE_TARGET + { + _target?.Dispose(); + _target = null; + } + }); + } + } +} diff --git a/src/Windows/Avalonia.Direct2D1/IExternalDirect2DRenderTargetSurface.cs b/src/Windows/Avalonia.Direct2D1/IExternalDirect2DRenderTargetSurface.cs new file mode 100644 index 0000000000..0774c25937 --- /dev/null +++ b/src/Windows/Avalonia.Direct2D1/IExternalDirect2DRenderTargetSurface.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Avalonia.Direct2D1 +{ + public interface IExternalDirect2DRenderTargetSurface + { + SharpDX.Direct2D1.RenderTarget CreateRenderTarget(); + void BeforeDrawing(); + void AfterDrawing(); + } +} diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs index 535ca900c2..0b46ba1c47 100644 --- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs +++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs @@ -23,6 +23,7 @@ namespace Avalonia.Direct2D1.Media private readonly IVisualBrushRenderer _visualBrushRenderer; private readonly SharpDX.Direct2D1.RenderTarget _renderTarget; private readonly SharpDX.DXGI.SwapChain1 _swapChain; + private readonly Action _finishedCallback; private SharpDX.DirectWrite.Factory _directWriteFactory; /// @@ -32,15 +33,18 @@ namespace Avalonia.Direct2D1.Media /// The render target to draw to. /// The DirectWrite factory. /// An optional swap chain associated with this drawing context. + /// An optional delegate to be called when context is disposed. public DrawingContextImpl( IVisualBrushRenderer visualBrushRenderer, SharpDX.Direct2D1.RenderTarget renderTarget, SharpDX.DirectWrite.Factory directWriteFactory, - SharpDX.DXGI.SwapChain1 swapChain = null) + SharpDX.DXGI.SwapChain1 swapChain = null, + Action finishedCallback = null) { _visualBrushRenderer = visualBrushRenderer; _renderTarget = renderTarget; _swapChain = swapChain; + _finishedCallback = finishedCallback; _directWriteFactory = directWriteFactory; _swapChain = swapChain; _renderTarget.BeginDraw(); @@ -73,6 +77,7 @@ namespace Avalonia.Direct2D1.Media _renderTarget.EndDraw(); _swapChain?.Present(1, SharpDX.DXGI.PresentFlags.None); + _finishedCallback?.Invoke(); } catch (SharpDXException ex) when ((uint)ex.HResult == 0x8899000C) // D2DERR_RECREATE_TARGET { From 5125784af54805ac7ff8a6ac5b4c4aa409e0c12d Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 3 Jun 2017 05:44:04 +0300 Subject: [PATCH 2/2] Missing file --- .../Avalonia.Direct2D1/Direct2D1Platform.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs index c2bf019ee6..3176dee7a4 100644 --- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs +++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs @@ -135,17 +135,17 @@ namespace Avalonia.Direct2D1 public IRenderTarget CreateRenderTarget(IEnumerable surfaces) { - var nativeWindow = surfaces?.OfType().FirstOrDefault(); - if (nativeWindow != null) + foreach (var s in surfaces) { - if(nativeWindow.HandleDescriptor != "HWND") - throw new NotSupportedException("Don't know how to create a Direct2D1 renderer from " + nativeWindow.HandleDescriptor); - return new HwndRenderTarget(nativeWindow); - } - var external = surfaces?.OfType(); - if (external != null) - { - + if (s is IPlatformHandle nativeWindow) + { + if (nativeWindow.HandleDescriptor != "HWND") + throw new NotSupportedException("Don't know how to create a Direct2D1 renderer from " + + nativeWindow.HandleDescriptor); + return new HwndRenderTarget(nativeWindow); + } + if (s is IExternalDirect2DRenderTargetSurface external) + return new ExternalRenderTarget(external, s_dwfactory); } throw new NotSupportedException("Don't know how to create a Direct2D1 renderer from any of provided surfaces"); }