Implemented interop with externally managed GPU memory

Avalonia.Desktop.slnf

@@ -5,6 +5,7 @@
       "packages\\Avalonia\\Avalonia.csproj",
       "samples\\ControlCatalog.NetCore\\ControlCatalog.NetCore.csproj",
       "samples\\ControlCatalog\\ControlCatalog.csproj",
+      "samples\\GpuInterop\\GpuInterop.csproj",
       "samples\\IntegrationTestApp\\IntegrationTestApp.csproj",
       "samples\\MiniMvvm\\MiniMvvm.csproj",
       "samples\\SampleControls\\ControlSamples.csproj",

Avalonia.sln

@@ -231,6 +231,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Browser.Blaz
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUIDemo", "samples\ReactiveUIDemo\ReactiveUIDemo.csproj", "{75C47156-C5D8-44BC-A5A7-E8657C2248D6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GpuInterop", "samples\GpuInterop\GpuInterop.csproj", "{C810060E-3809-4B74-A125-F11533AF9C1B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -542,6 +544,10 @@ Global
 		{75C47156-C5D8-44BC-A5A7-E8657C2248D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75C47156-C5D8-44BC-A5A7-E8657C2248D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75C47156-C5D8-44BC-A5A7-E8657C2248D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C810060E-3809-4B74-A125-F11533AF9C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C810060E-3809-4B74-A125-F11533AF9C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C810060E-3809-4B74-A125-F11533AF9C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C810060E-3809-4B74-A125-F11533AF9C1B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -606,6 +612,7 @@ Global
 		{15B93A4C-1B46-43F6-B534-7B25B6E99932} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{90B08091-9BBD-4362-B712-E9F2CC62B218} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 		{75C47156-C5D8-44BC-A5A7-E8657C2248D6} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{C810060E-3809-4B74-A125-F11533AF9C1B} = {9B9E3891-2366-4253-A952-D08BCEB71098}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}

build/Base.props

@@ -1,6 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Condition="'$(TargetFramework)' != 'net6'">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
   </ItemGroup>

build/SharpDX.props

@@ -1,9 +1,14 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SharpDXPackageVersion>4.0.1</SharpDXPackageVersion>
+  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SharpDX" Version="4.0.1" />
-    <PackageReference Include="SharpDX.Direct2D1" Version="4.0.1" />
-    <PackageReference Include="SharpDX.Direct3D11" Version="4.0.1" />
-    <PackageReference Include="SharpDX.DXGI" Version="4.0.1" />
-    <PackageReference Include="SharpDX.Direct3D9" Version="4.0.1" Condition="'$(UseDirect3D9)' == 'true'" />
+    <PackageReference Include="SharpDX" Version="$(SharpDXPackageVersion)" />
+    <PackageReference Include="SharpDX.Direct2D1" Version="$(SharpDXPackageVersion)" />
+    <PackageReference Include="SharpDX.Direct3D11" Version="$(SharpDXPackageVersion)" />
+    <PackageReference Include="SharpDX.DXGI" Version="$(SharpDXPackageVersion)" />
+    <PackageReference Include="SharpDX.Direct3D9" Version="$(SharpDXPackageVersion)" Condition="'$(UseDirect3D9)' == 'true'" />
+    <PackageReference Include="SharpDX.D3DCompiler" Version="$(SharpDXPackageVersion)" Condition="'$(UseD3DCompiler)' == 'true'" />
+    <PackageReference Include="SharpDX.Mathematics" Version="$(SharpDXPackageVersion)" Condition="'$(UseSharpDXMathematics)' == 'true'" />
   </ItemGroup>
 </Project>

samples/ControlCatalog/Pages/OpenGlPage.xaml.cs

@@ -78,12 +78,7 @@ public string Info
             get => _info;
             private set => SetAndRaise(InfoProperty, ref _info, value);
         }
-
-        static OpenGlPageControl()
-        {
-            AffectsRender<OpenGlPageControl>(YawProperty, PitchProperty, RollProperty, DiscoProperty);
-        }
-
+
         private int _vertexShader;
         private int _fragmentShader;
         private int _shaderProgram;
@@ -254,7 +249,7 @@ private static void CheckError(GlInterface gl)
                 Console.WriteLine(err);
         }
 
-        protected unsafe override void OnOpenGlInit(GlInterface GL, int fb)
+        protected override unsafe void OnOpenGlInit(GlInterface GL)
         {
             CheckError(GL);
 
@@ -309,7 +304,7 @@ protected unsafe override void OnOpenGlInit(GlInterface GL, int fb)
 
         }
 
-        protected override void OnOpenGlDeinit(GlInterface GL, int fb)
+        protected override void OnOpenGlDeinit(GlInterface GL)
         {
             // Unbind everything
             GL.BindBuffer(GL_ARRAY_BUFFER, 0);
@@ -366,7 +361,15 @@ protected override unsafe void OnOpenGlRender(GlInterface gl, int fb)
 
             CheckError(GL);
             if (_disco > 0.01)
-                Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+                RequestNextFrameRendering();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == YawProperty || change.Property == RollProperty || change.Property == PitchProperty ||
+                change.Property == DiscoProperty)
+                RequestNextFrameRendering();
+            base.OnPropertyChanged(change);
         }
     }
 }

samples/GpuInterop/App.axaml

@@ -0,0 +1,8 @@
+<Application
+    xmlns="https://github.com/avaloniaui" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:Class="GpuInterop.App">
+    <Application.Styles>
+        <FluentTheme />
+    </Application.Styles>
+</Application>

samples/GpuInterop/App.axaml.cs

@@ -0,0 +1,22 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+
+namespace GpuInterop
+{
+    public class App : Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
+            {
+                desktopLifetime.MainWindow = new MainWindow();
+            }
+        }
+    }
+}

samples/GpuInterop/D3DDemo/D3D11DemoControl.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Numerics;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Platform;
+using Avalonia.Rendering.Composition;
+using SharpDX;
+using SharpDX.Direct2D1;
+using SharpDX.Direct3D11;
+using SharpDX.DXGI;
+using SharpDX.Mathematics.Interop;
+using Buffer = SharpDX.Direct3D11.Buffer;
+using DeviceContext = SharpDX.Direct2D1.DeviceContext;
+using DxgiFactory1 = SharpDX.DXGI.Factory1;
+using Matrix = SharpDX.Matrix;
+using D3DDevice = SharpDX.Direct3D11.Device;
+using DxgiResource = SharpDX.DXGI.Resource;
+using FeatureLevel = SharpDX.Direct3D.FeatureLevel;
+using Vector3 = SharpDX.Vector3;
+
+namespace GpuInterop.D3DDemo;
+
+public class D3D11DemoControl : DrawingSurfaceDemoBase
+{
+    private D3DDevice _device;
+    private D3D11Swapchain _swapchain;
+    private SharpDX.Direct3D11.DeviceContext _context;
+    private Matrix _view;
+    private PixelSize _lastSize;
+    private Texture2D _depthBuffer;
+    private DepthStencilView _depthView;
+    private Matrix _proj;
+    private Buffer _constantBuffer;
+    private Stopwatch _st = Stopwatch.StartNew();
+
+    protected override (bool success, string info) InitializeGraphicsResources(Compositor compositor,
+        CompositionDrawingSurface surface, ICompositionGpuInterop interop)
+    {
+        if (interop?.SupportedImageHandleTypes.Contains(KnownPlatformGraphicsExternalImageHandleTypes
+                .D3D11TextureGlobalSharedHandle) != true)
+            return (false, "DXGI shared handle import is not supported by the current graphics backend");
+
+        var factory = new DxgiFactory1();
+        using var adapter = factory.GetAdapter1(0);
+        _device = new D3DDevice(adapter, DeviceCreationFlags.None, new[]
+        {
+            FeatureLevel.Level_12_1,
+            FeatureLevel.Level_12_0,
+            FeatureLevel.Level_11_1,
+            FeatureLevel.Level_11_0,
+            FeatureLevel.Level_10_0,
+            FeatureLevel.Level_9_3,
+            FeatureLevel.Level_9_2,
+            FeatureLevel.Level_9_1,
+        });
+        _swapchain = new D3D11Swapchain(_device, interop, surface);
+        _context = _device.ImmediateContext;
+        _constantBuffer = D3DContent.CreateMesh(_device);
+        _view = Matrix.LookAtLH(new Vector3(0, 0, -5), new Vector3(0, 0, 0), Vector3.UnitY);
+        return (true, $"D3D11 ({_device.FeatureLevel}) {adapter.Description1.Description}");
+    }
+
+    protected override void FreeGraphicsResources()
+    {
+        _swapchain.DisposeAsync();
+        _swapchain = null!;
+        Utilities.Dispose(ref _depthView);
+        Utilities.Dispose(ref _depthBuffer);
+        Utilities.Dispose(ref _constantBuffer);
+        Utilities.Dispose(ref _context);
+        Utilities.Dispose(ref _device);
+    }
+
+    protected override bool SupportsDisco => true;
+
+    protected override void RenderFrame(PixelSize pixelSize)
+    {
+        if (pixelSize == default)
+            return;
+        if (pixelSize != _lastSize)
+            Resize(pixelSize);
+        using (_swapchain.BeginDraw(pixelSize, out var renderView))
+        {
+
+            _device.ImmediateContext.OutputMerger.SetTargets(_depthView, renderView);
+            var viewProj = Matrix.Multiply(_view, _proj);
+            var context = _device.ImmediateContext;
+
+            var now = _st.Elapsed.TotalSeconds * 5;
+            var scaleX = (float)(1f + Disco * (Math.Sin(now) + 1) / 6);
+            var scaleY = (float)(1f + Disco * (Math.Cos(now) + 1) / 8);
+            var colorOff =(float) (Math.Sin(now) + 1) / 2 * Disco;
+
+
+            // Clear views
+            context.ClearDepthStencilView(_depthView, DepthStencilClearFlags.Depth, 1.0f, 0);
+            context.ClearRenderTargetView(renderView,
+                new RawColor4(1 - colorOff, colorOff, (float)0.5 + colorOff / 2, 1));
+
+
+            var ypr = Matrix4x4.CreateFromYawPitchRoll(Yaw, Pitch, Roll);
+            // Update WorldViewProj Matrix
+            var worldViewProj = Matrix.RotationX((float)Yaw) * Matrix.RotationY((float)Pitch)
+                                                                          * Matrix.RotationZ((float)Roll)
+                                                                          * Matrix.Scaling(new Vector3(scaleX, scaleY, 1))
+                                                                          * viewProj;
+            worldViewProj.Transpose();
+            context.UpdateSubresource(ref worldViewProj, _constantBuffer);
+
+            // Draw the cube
+            context.Draw(36, 0);
+
+
+            _context.Flush();
+        }
+    }
+
+    private void Resize(PixelSize size)
+    {
+        Utilities.Dispose(ref _depthBuffer);
+        _depthBuffer = new Texture2D(_device,
+            new Texture2DDescription()
+            {
+                Format = Format.D32_Float_S8X24_UInt,
+                ArraySize = 1,
+                MipLevels = 1,
+                Width = (int)size.Width,
+                Height = (int)size.Height,
+                SampleDescription = new SampleDescription(1, 0),
+                Usage = ResourceUsage.Default,
+                BindFlags = BindFlags.DepthStencil,
+                CpuAccessFlags = CpuAccessFlags.None,
+                OptionFlags = ResourceOptionFlags.None
+            });
+
+        Utilities.Dispose(ref _depthView);
+        _depthView = new DepthStencilView(_device, _depthBuffer);
+
+        // Setup targets and viewport for rendering
+        _device.ImmediateContext.Rasterizer.SetViewport(new Viewport(0, 0, (int)size.Width, (int)size.Height, 0.0f, 1.0f));
+
+        // Setup new projection matrix with correct aspect ratio
+        _proj = Matrix.PerspectiveFovLH((float)Math.PI / 4.0f, (float)(size.Width / size.Height), 0.1f, 100.0f);
+    }
+}