Various updates of Avalonia.Vulkan and SilkNetDemo projects

samples/SilkNetDemo/MainWindow.axaml

@@ -6,5 +6,5 @@
         x:Class="SilkNetDemo.MainWindow"
         Title="SilkNetDemo"
         xmlns:local="clr-namespace:SilkNetDemo">
-    <local:VulkanDemo />
-</Window>
+    <local:VulkanDemo x:Name="VulkanDemo1"/>
+</Window>

samples/SilkNetDemo/MainWindow.axaml.cs

@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 
 namespace SilkNetDemo
@@ -9,6 +10,13 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
+
+            this.Unloaded += delegate(object? sender, RoutedEventArgs args)
+            {
+                var vulkanDemo = this.Get<VulkanDemo>("VulkanDemo1");
+                vulkanDemo.Dispose();
+            };
+
 #if DEBUG
             this.AttachDevTools();
 #endif
@@ -19,4 +27,4 @@ private void InitializeComponent()
             AvaloniaXamlLoader.Load(this);
         }
     }
-}
+}

samples/SilkNetDemo/VulkanDemo.axaml.cs

@@ -4,5 +4,9 @@ namespace SilkNetDemo;
 
 public class VulkanDemo : UserControl
 {
-
-}
+    public void Dispose()
+    {
+        var vulkanDemoControl = this.Get<VulkanDemoControl>("Vulkan");
+        vulkanDemoControl?.Dispose();
+    }
+}

samples/SilkNetDemo/VulkanDemoControl.cs

@@ -97,7 +97,6 @@ static VulkanDemoControl()
     private DeviceMemory _depthImageMemory;
     private ImageView _depthImageView;
     private VulkanCommandBufferPool _commandPool;
-    private Fence _fence;
     private Vk _vk;
 
     private byte[] GetShader(bool fragment)
@@ -129,10 +128,12 @@ protected override void OnVulkanRender(IVulkanSharedDevice sharedDevice, ISwapch
 
             _previousSwapchain = swapchain;
 
+            var pixelSize = swapchain.Size;
+
             var view = Matrix4x4.CreateLookAt(new Vector3(25, 25, 25), new Vector3(), new Vector3(0, -1, 0));
             var model = Matrix4x4.CreateFromYawPitchRoll(_yaw, _pitch, _roll);
             var projection =
-                Matrix4x4.CreatePerspectiveFieldOfView((float)(Math.PI / 4), (float)(Bounds.Width / Bounds.Height),
+                Matrix4x4.CreatePerspectiveFieldOfView((float)Math.PI / 4f, (float)pixelSize.Width / (float)pixelSize.Height,
                     0.01f, 1000);
 
             var vertexConstant = new VertextPushConstant()
@@ -159,8 +160,8 @@ protected override void OnVulkanRender(IVulkanSharedDevice sharedDevice, ISwapch
             api.CmdSetViewport(commandBufferHandle, 0, 1,
                 new Viewport()
                 {
-                    Width = (float)Bounds.Width,
-                    Height = (float)Bounds.Height,
+                    Width = (float)pixelSize.Width,
+                    Height = (float)pixelSize.Height,
                     MaxDepth = 1,
                     MinDepth = 0,
                     X = 0,
@@ -169,7 +170,7 @@ protected override void OnVulkanRender(IVulkanSharedDevice sharedDevice, ISwapch
 
             var scissor = new Rect2D
             {
-                Extent = new Extent2D((uint?)Bounds.Width, (uint?)Bounds.Height)
+                Extent = new Extent2D((uint?)pixelSize.Width, (uint?)pixelSize.Height)
             };
 
             api.CmdSetScissor(commandBufferHandle, 0, 1, &scissor);
@@ -187,7 +188,7 @@ protected override void OnVulkanRender(IVulkanSharedDevice sharedDevice, ISwapch
                     RenderPass = _renderPass,
                     Framebuffer = _framebuffers[swapchain.CurrentImageIndex],
                     RenderArea =
-                        new Rect2D(new Offset2D(0, 0), new Extent2D((uint?)Bounds.Width, (uint?)Bounds.Height)),
+                        new Rect2D(new Offset2D(0, 0), new Extent2D((uint?)pixelSize.Width, (uint?)pixelSize.Height)),
                     ClearValueCount = 2,
                     PClearValues = clearValue
                 };
@@ -238,7 +239,6 @@ protected override void OnVulkanDeInit(IVulkanSharedDevice sharedDevice)
 
                 api.DestroyBuffer(device, _indexBuffer, null);
                 api.FreeMemory(device, _indexBufferMemory, null);
-                api.DestroyFence(device, _fence, null);
 
                 _commandPool.Dispose();
             }
@@ -274,16 +274,16 @@ public unsafe void DestroyTemporalObjects(Vk api, Device device)
         }
     }
 
-    private unsafe void CreateDepthAttachment(Vk api, Device device, PhysicalDevice physicalDevice)
+    private unsafe void CreateDepthAttachment(Vk api, Device device, PhysicalDevice physicalDevice, PixelSize size)
     {
         var imageCreateInfo = new ImageCreateInfo
         {
             SType = StructureType.ImageCreateInfo,
             ImageType = ImageType.ImageType2D,
             Format = Format.D32Sfloat,
             Extent =
-                new Extent3D((uint?)Bounds.Width,
-                    (uint?)Bounds.Height, 1),
+                new Extent3D((uint?)size.Width,
+                    (uint?)size.Height, 1),
             MipLevels = 1,
             ArrayLayers = 1,
             Samples = SampleCountFlags.SampleCount1Bit,
@@ -343,7 +343,7 @@ private unsafe void CreateTemporalObjects(Vk api, Device device, PhysicalDevice
     {
         DestroyTemporalObjects(api, device);
 
-        CreateDepthAttachment(api, device, physicalDevice);
+        CreateDepthAttachment(api, device, physicalDevice, swapchain.Size);
 
         var current = swapchain.GetImage(swapchain.CurrentImageIndex);
         // create renderpasses
@@ -486,8 +486,8 @@ private unsafe void CreateTemporalObjects(Vk api, Device device, PhysicalDevice
             {
                 X = 0,
                 Y = 0,
-                Width = (float)Bounds.Width,
-                Height = (float)Bounds.Height,
+                Width = (float)swapchain.Size.Width,
+                Height = (float)swapchain.Size.Height,
                 MinDepth = 0,
                 MaxDepth = 1
             };
@@ -784,7 +784,6 @@ protected override void OnVulkanInit(IVulkanSharedDevice sharedDevice)
                 Flags = FenceCreateFlags.FenceCreateSignaledBit
             };
 
-            api.CreateFence(device, fenceCreateInfo, null, out _fence);
             _commandPool = new VulkanCommandBufferPool(api, device, new Queue(sharedDevice.Device.MainQueueHandle),
                 sharedDevice.Device.GraphicsQueueFamilyIndex);
         }
@@ -904,4 +903,4 @@ public VulkanDemoControl()
         }
 
     }
-}
+}

samples/SilkNetDemo/VulkanUtils/VulkanCommandBufferPool.cs

@@ -128,7 +128,10 @@ public void BeginRecording()
             {
                 if (!_hasStarted)
                 {
-                    _hasStarted = true;
+                    _api.WaitForFences(_device, 1, _fence, true, ulong.MaxValue);
+
+                    _api.ResetFences(_device, 1, _fence);
+
 
                     var beginInfo = new CommandBufferBeginInfo
                     {
@@ -137,6 +140,8 @@ public void BeginRecording()
                     };
 
                     _api.BeginCommandBuffer(InternalHandle, beginInfo);
+
+                    _hasStarted = true;
                 }
             }
 
@@ -152,20 +157,16 @@ public void EndRecording()
 
             public void Submit()
             {
-                Submit(null, null, null, _fence);
+                Submit(null, null, null);
             }
 
             public unsafe void Submit(
                 ReadOnlySpan<Semaphore> waitSemaphores,
                 ReadOnlySpan<PipelineStageFlags> waitDstStageMask,
-                ReadOnlySpan<Semaphore> signalSemaphores,
-                Fence? fence = null)
+                ReadOnlySpan<Semaphore> signalSemaphores)
             {
                 EndRecording();
 
-                if (!fence.HasValue)
-                    fence = _fence;
-
                 fixed (Semaphore* pWaitSemaphores = waitSemaphores, pSignalSemaphores = signalSemaphores)
                 {
                     fixed (PipelineStageFlags* pWaitDstStageMask = waitDstStageMask)
@@ -182,10 +183,8 @@ public unsafe void Submit(
                             SignalSemaphoreCount = signalSemaphores != null ? (uint)signalSemaphores.Length : 0,
                             PSignalSemaphores = pSignalSemaphores,
                         };
-
-                        _api.ResetFences(_device, 1, fence.Value);
-
-                        _api.QueueSubmit(_queue, 1, submitInfo, fence.Value);
+
+                        _api.QueueSubmit(_queue, 1, submitInfo, _fence);
                     }
                 }
 

src/Avalonia.Vulkan/Interop/VulkanDevice.cs

@@ -31,11 +31,21 @@ private VulkanDevice(IVulkanInstance instance, VkDevice handle, VkPhysicalDevice
 
     T CheckAccess<T>(T f)
     {
+        CheckIsDisposed(f);
+
         if (_lockedByThread != Thread.CurrentThread)
             throw new InvalidOperationException("This class is only usable when locked");
         return f;
     }
 
+    private T CheckIsDisposed<T>(T f)
+    {
+        if (IsDisposed)
+            throw new VulkanException("Cannot access a disposed VulkanDevice");
+
+        return f;
+    }
+
     public IDisposable Lock()
     {
         Monitor.Enter(_lock);
@@ -51,15 +61,27 @@ public IDisposable Lock()
     }
 
     public bool IsLost => false;
-    public IntPtr Handle => _handle.Handle;
-    public IntPtr PhysicalDeviceHandle => _physicalDeviceHandle.Handle;
+    public IntPtr Handle => CheckIsDisposed(_handle).Handle;
+    public IntPtr PhysicalDeviceHandle => CheckIsDisposed(_physicalDeviceHandle).Handle;
     public IntPtr MainQueueHandle => CheckAccess(_mainQueue).Handle;
     public uint GraphicsQueueFamilyIndex => _graphicsQueueIndex;
     public IVulkanInstance Instance { get; }
+    public bool IsDisposed { get; private set; }
+
+    public object? TryGetFeature(Type featureType) => null;
+
+
     public void Dispose()
     {
-        // TODO
-    }
+        if (IsDisposed)
+            return;
 
-    public object? TryGetFeature(Type featureType) => null;
-}
+        if (_handle.Handle != IntPtr.Zero)
+        {
+            var api = new VulkanInstanceApi(Instance);
+            api.DestroyDevice(_handle, IntPtr.Zero);
+        }
+
+        IsDisposed = true;
+    }
+}

src/Avalonia.Vulkan/UnmanagedInterop/VulkanInstanceApi.cs

@@ -56,6 +56,9 @@ public partial void GetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, u
     [GetProcAddress("vkDestroySurfaceKHR")]
     public partial void DestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, IntPtr pAllocator);
 
+    [GetProcAddress("vkDestroyDevice")]
+    public partial void DestroyDevice(VkDevice device, IntPtr pAllocator);
+
     [GetProcAddress("vkGetPhysicalDeviceSurfaceFormatsKHR")]
     public partial VkResult GetPhysicalDeviceSurfaceFormatsKHR(
         VkPhysicalDevice physicalDevice,
@@ -74,4 +77,4 @@ public partial VkResult GetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice
     [GetProcAddress("vkGetPhysicalDeviceSurfacePresentModesKHR")]
     public partial VkResult GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface,
         ref uint32_t pPresentModeCount, VkPresentModeKHR* pPresentModes);
-}
+}

src/Avalonia.Vulkan/VulkanControlBase.cs

@@ -15,13 +15,18 @@
 
 namespace Avalonia.Vulkan;
 
-public abstract class VulkanControlBase : Control
+public abstract class VulkanControlBase : Control, IDisposable
 {
     private Task<bool>? _initialization;
     private VulkanControlContext? _currentContext;
 
+    public bool IsDisposed { get; private set; }
+
     private bool EnsureInitialized()
     {
+        if (IsDisposed)
+            return false;
+
         if (_initialization != null)
         {
             // Check if we've previously failed to initialize on this platform
@@ -47,7 +52,7 @@ await this.GetVisualRoot()!.Renderer.TryGetRenderInterfaceFeature(
                 typeof(IVulkanSharedDeviceGraphicsContextFeature));
         if (feature?.SharedDevice == null)
         {
-            Logger.TryGet(LogEventLevel.Error, "OpenGL")?.Log("VulkanControlBase",
+            Logger.TryGet(LogEventLevel.Error, "Vulkan")?.Log("VulkanControlBase",
                 "Unable to obtain Vulkan device from the renderer");
             return false;
         }
@@ -76,27 +81,23 @@ protected virtual void OnVulkanRender(IVulkanSharedDevice device, ISwapchain ima
 
     public sealed override void Render(DrawingContext context)
     {
-        if(!EnsureInitialized())
+        if(IsDisposed || !EnsureInitialized())
             return;
         _currentContext!.Render(context);
     }
 
-    void DoCleanup()
+    public void Dispose()
     {
-        if (_currentContext != null)
+        if (_currentContext != null && !IsDisposed)
         {
             OnVulkanDeInit(_currentContext.SharedDevice);
             _currentContext.Dispose();
             _currentContext = null;
             _initialization = null;
+
+            IsDisposed = true;
         }
     }
-
-    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
-    {
-        DoCleanup();
-        base.OnDetachedFromVisualTree(e);
-    }
 
 
     class VulkanControlContext : IDisposable
@@ -193,7 +194,11 @@ public void Render(IDrawingContextImpl context)
             var bitmap = _chain.GetConsumerBitmap();
             if (bitmap == null)
                 return;
-            context.DrawBitmap(RefCountable.CreateUnownedNotClonable(bitmap), 1, Bounds, Bounds);
+
+            context.DrawBitmap(source: RefCountable.CreateUnownedNotClonable(bitmap), 
+                               opacity: 1, 
+                               sourceRect: new Rect(0, 0, _chain.Size.Width, _chain.Size.Height), 
+                               destRect: Bounds);
         }
 
         public bool Equals(ICustomDrawOperation? other) => false;
@@ -203,6 +208,7 @@ protected interface ISwapchain
     {
         public int ImageCount { get; }
         public int CurrentImageIndex { get; }
+        public PixelSize Size { get; }
         public VulkanImageInfo GetImage(int index);
     }
 
@@ -318,4 +324,4 @@ public VulkanImageInfo GetImage(int index)
             return _images[index].ImageInfo;
         }
     }
-}
+}