Added Vertie backend (3D) and reworked texture management

src/Directory.Build.props

@@ -1,5 +1,7 @@
 <Project>
 <PropertyGroup>
-    <AvaloniaVersion>11.3.12-cibuild0004211-alpha</AvaloniaVersion>
+    <AvaloniaVersion>[12.1.1-cibuild0004449-alpha]</AvaloniaVersion>
+    <AvaloniaAccessUnstablePrivateApis>true</AvaloniaAccessUnstablePrivateApis>
+  <Avalonia_I_Want_To_Use_Private_Apis_In_Nuget_Package_And_Promise_To_Pin_The_Exact_Avalonia_Version_In_Package_Dependency>true</Avalonia_I_Want_To_Use_Private_Apis_In_Nuget_Package_And_Promise_To_Pin_The_Exact_Avalonia_Version_In_Package_Dependency>
 </PropertyGroup>
 </Project>

src/DrawiEngine.Browser/BrowserDrawingEngine.cs

@@ -1,7 +1,7 @@
 using Drawie.JSInterop;
 using Drawie.RenderApi.WebGl;
 using Drawie.Skia;
-using Drawie.Windowing.Browser;
+using Drawie.Host.Browser;
 
 namespace DrawiEngine.Browser;
 

src/DrawiEngine.Browser/DrawiEngine.Browser.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\Drawie.Backend.Skia\Drawie.Backend.Skia.csproj" />
       <ProjectReference Include="..\Drawie.RenderApi.WebGl\Drawie.RenderApi.WebGl.csproj" />
-      <ProjectReference Include="..\Drawie.Windowing.Browser\Drawie.Windowing.Browser.csproj" />
+      <ProjectReference Include="..\Drawie.Host.Browser\Drawie.Host.Browser.csproj" />
       <ProjectReference Include="..\DrawiEngine\DrawiEngine.csproj" />
     </ItemGroup>
 

src/DrawiEngine.Desktop/DesktopDrawingEngine.cs

@@ -8,9 +8,9 @@ namespace DrawiEngine.Desktop;
 
 public static class DesktopDrawingEngine
 {
-    public static DrawingEngine CreateDefaultDesktop()
+    public static DrawingEngine CreateDefaultDesktop(bool preferVulkan = true)
     {
-        IRenderApi renderApi = new VulkanRenderApi();
+        IRenderApi renderApi = preferVulkan ? new VulkanRenderApi() : new OpenGlRenderApi();
 
         if (OperatingSystem.IsMacOS())
         {

src/DrawiEngine.Desktop/DrawiEngine.Desktop.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\Drawie.RenderApi.OpenGl\Drawie.RenderApi.OpenGl.csproj" />
       <ProjectReference Include="..\Drawie.RenderApi.Vulkan\Drawie.RenderApi.Vulkan.csproj" />
-      <ProjectReference Include="..\Drawie.Windowing.Glfw\Drawie.Windowing.Glfw.csproj" />
+      <ProjectReference Include="..\Drawie.Host.Glfw\Drawie.Host.Glfw.csproj" />
       <ProjectReference Include="..\DrawiEngine\DrawiEngine.csproj" />
     </ItemGroup>
 

src/DrawiEngine/DrawiEngine.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Drawie.Backend.Core\Drawie.Backend.Core.csproj" />
-    <ProjectReference Include="..\Drawie.Windowing\Drawie.Windowing.csproj" />
+    <ProjectReference Include="..\Drawie.Host\Drawie.Host.csproj" />
   </ItemGroup>
   </Project>

src/DrawiEngine/DrawieApp.cs

@@ -1,5 +1,5 @@
 using Drawie.Backend.Core.Bridge;
-using Drawie.Windowing;
+using Drawie.Host;
 
 namespace DrawiEngine;
 
@@ -17,11 +17,11 @@ public void Initialize(DrawingEngine engine)
         Engine = engine;
     }
 
-    public abstract IWindow CreateMainWindow();
+    public abstract IHost CreateMainWindow();
 
     public void Run()
     {
-        if (DrawingBackendApi.HasBackend)
+        if (DrawingBackendApi.Initialized)
         {
             OnInitialize();
         }

src/DrawiEngine/DrawieRenderingDispatcher.cs

@@ -4,7 +4,40 @@ namespace DrawiEngine;
 
 public class DrawieRenderingDispatcher : IRenderingDispatcher
 {
-    public Action<Action> Invoke { get; } = action => action();
+    private bool renderApiReady = false;
+
+    private List<Action> queuedActions = new List<Action>();
+
+    public Action<Action> Invoke { get; }
+
+    public DrawieRenderingDispatcher()
+    {
+        Invoke = OnInvoke;
+    }
+
+    private void OnInvoke(Action action)
+    {
+        if (renderApiReady)
+        {
+            action();
+        }
+        else
+        {
+            queuedActions.Add(action);
+        }
+    }
+
+    void IRenderingDispatcher.RenderApiReady()
+    {
+        renderApiReady = true;
+
+        foreach (var action in queuedActions)
+        {
+            action();
+        }
+
+        queuedActions.Clear();
+    }
 
     public async Task<TResult> InvokeAsync<TResult>(Func<TResult> func)
     {
@@ -32,4 +65,4 @@ public class EmptyDisposable : IDisposable
     public void Dispose()
     {
     }
-}
+}

src/DrawiEngine/DrawingEngine.cs

@@ -1,7 +1,7 @@
 using Drawie.Backend.Core;
 using Drawie.Backend.Core.Bridge;
 using Drawie.RenderApi;
-using Drawie.Windowing;
+using Drawie.Host;
 
 namespace DrawiEngine;
 
@@ -32,14 +32,14 @@ public void RunWithApp(DrawieApp app)
         Console.WriteLine($"\t- DrawingBackend: {DrawingBackend}");
 
         app.Initialize(this);
-        IWindow window = app.CreateMainWindow();
+        IHost host = app.CreateMainWindow();
 
-        window.Initialize();
+        host.Initialize();
 
         DrawingBackendApi.InitializeBackend(RenderApi);
 
         app.Run();
-        window.Show();
+        host.Show();
     }
 
     public void Run()
@@ -55,5 +55,6 @@ public void Run()
     public async ValueTask Dispose()
     {
         await DrawingBackend.DisposeAsync();
+        RenderApi.Dispose();
     }
 }

src/Drawie.AvaloniaInterop/Drawie.AvaloniaInterop.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -11,12 +11,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia" Version="12.1.1" />
+        <PackageReference Include="Avalonia.Desktop" Version="12.1.1" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.1" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.1" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.19" />
     </ItemGroup>
 
     <ItemGroup>

src/Drawie.AvaloniaInterop/MainWindow.axaml.cs

@@ -23,15 +23,15 @@ public MainWindow()
 
     protected override void OnLoaded(RoutedEventArgs e)
     {
-        Texture texture = new Texture(new VecI(128, 128));
+        NativeTexture nativeTexture = new NativeTexture(new VecI(128, 128));
         using Paint paint = new Paint();
         paint.Color = Colors.Red;
 
-        texture.DrawingSurface.Canvas.DrawRect(0, 0, 128, 128, paint);
+        nativeTexture.DrawingSurface.Canvas.DrawRect(0, 0, 128, 128, paint);
         paint.Color = Colors.Blue;
-        texture.DrawingSurface.Canvas.DrawCircle(64, 64, 64, paint);
+        nativeTexture.DrawingSurface.Canvas.DrawCircle(64, 64, 64, paint);
 
-        DrawieControl.Texture = texture;
+        DrawieControl.NativeTexture = nativeTexture;
         base.OnLoaded(e);
     }
 
@@ -45,15 +45,15 @@ public override void Render(DrawingContext context)
         byte green = (byte)(Math.Sin(time / 1000.0 + 2) * 127 + 128);
         byte blue = (byte)(Math.Sin(time / 1000.0 + 4) * 127 + 128);
 
-        DrawieControl.Texture?.DrawingSurface.Canvas.DrawRect(0, 0, 128, 128, new Paint()
+        DrawieControl.NativeTexture?.DrawingSurface.Canvas.DrawRect(0, 0, 128, 128, new Paint()
         {
             Color = new Color(red, green, blue, 255),
             Style = PaintStyle.StrokeAndFill
         });
 
         // test transparency
 
-        DrawieControl.Texture?.DrawingSurface.Canvas.DrawCircle(64, 64, 64, new Paint()
+        DrawieControl.NativeTexture?.DrawingSurface.Canvas.DrawCircle(64, 64, 64, new Paint()
         {
             Color = new Color(255, 255, 255, 128),
             Style = PaintStyle.Fill

src/Drawie.AvaloniaInterop/Program.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Threading.Tasks;
 using Avalonia.Logging;
+using Avalonia.OpenGL.Egl;
 using Avalonia.Vulkan;
 using Drawie.Interop.Avalonia.Vulkan;
 using Drawie.Interop.VulkanAvalonia;
@@ -32,7 +33,7 @@ public static AppBuilder BuildAvaloniaApp()
                     Win32RenderingMode.Vulkan
                 },
             })
-            .With(new X11PlatformOptions() { RenderingMode = new[] { X11RenderingMode.Vulkan, X11RenderingMode.Glx } })
+            .With(new X11PlatformOptions() { RenderingMode = new[] { X11RenderingMode.Egl, X11RenderingMode.Glx } })
             .WithDrawie()
             .LogToTrace(LogEventLevel.Debug, "Vulkan");
 }

src/Drawie.Backend.Core/Bridge/DrawingBackendApi.cs

@@ -22,6 +22,7 @@ public static IDrawingBackend Current
         }
 
         public static bool HasBackend => _current != null;
+        public static bool Initialized { get; private set; }
 
         public static void SetupBackend(IDrawingBackend backend, IRenderingDispatcher dispatcher)
         {
@@ -32,8 +33,6 @@ public static void SetupBackend(IDrawingBackend backend, IRenderingDispatcher di
 
             _current = backend;
             _current.RenderingDispatcher = dispatcher;
-
-            OnBackendInitialized?.Invoke();
         }
 
         public static void InitializeBackend(IRenderApi renderApi)
@@ -44,6 +43,9 @@ public static void InitializeBackend(IRenderApi renderApi)
             }
 
             _current.Setup(renderApi);
+            _current.RenderingDispatcher.RenderApiReady();
+            OnBackendInitialized?.Invoke();
+            Initialized = true;
         }
     }
 }

src/Drawie.Backend.Core/Bridge/IDrawingBackend.cs

@@ -3,11 +3,13 @@
 using Drawie.Backend.Core.Surfaces;
 using Drawie.Numerics;
 using Drawie.RenderApi;
+using Drawie.RenderApi.Abstraction.Textures;
 
 namespace Drawie.Backend.Core.Bridge
 {
     public interface IDrawingBackend : IAsyncDisposable
     {
+        public IRenderApi ActiveRenderApi { get; }
         public void Setup(IRenderApi renderApi);
         public IColorImplementation ColorImplementation { get; }
         public IImageImplementation ImageImplementation { get; }
@@ -31,8 +33,9 @@ public interface IDrawingBackend : IAsyncDisposable
         public IPictureImplementation PictureImplementation { get; }
         public IBlenderImplementation BlenderImplementation { get; }
         public IMeshImplementation MeshImplementation { get; }
-        public DrawingSurface CreateRenderSurface(VecI size, ITexture renderTexture, SurfaceOrigin origin);
+        public DrawingSurface? CreateRenderSurface(VecI size, ITexture renderTexture, SurfaceOrigin origin);
         public int GetNativeInstancesTotalCount();
         public void Flush();
+        void ResetContext();
     }
 }

src/Drawie.Backend.Core/Bridge/NativeObjectsImpl/IPaintImplementation.cs

@@ -15,8 +15,6 @@ public interface IPaintImplementation
         public void SetColor(Paint paint, Color value);
         public BlendMode GetBlendMode(Paint paint);
         public void SetBlendMode(Paint paint, BlendMode value);
-        public FilterQuality GetFilterQuality(Paint paint);
-        public void SetFilterQuality(Paint paint, FilterQuality value);
         public bool GetIsAntiAliased(Paint paint);
         public void SetIsAntiAliased(Paint paint, bool value);
         public PaintStyle GetStyle(Paint paint);

src/Drawie.Backend.Core/Bridge/Operations/IImageImplementation.cs

@@ -29,5 +29,9 @@ public Shader ToShader(IntPtr objectPointer, TileMode tileX, TileMode tileY, Sam
             Matrix3X3 localMatrix);
         public Shader ToRawShader(IntPtr objectPointer);
         public Shader? ToShader(IntPtr objectPointer, TileMode clamp, TileMode tileMode, Matrix3X3 fillMatrixValue);
+        public uint GetUniqueId(IntPtr objectPointer);
+        /*
+        public ulong? GetTextureId(IntPtr objectPointer);
+    */
     }
 }

src/Drawie.Backend.Core/Bridge/Operations/ISurfaceImplementation.cs

@@ -21,5 +21,7 @@ public interface ISurfaceImplementation
     public RectI GetDeviceClipBounds(IntPtr drawingSurface);
     public void Unmanage(DrawingSurface surface);
     public RectD GetLocalClipBounds(IntPtr objectPointer);
+    INativeSurfaceInfo? GetNativeSurfaceInfo(IntPtr objectPointer);
+    INativeSurfaceInfo? ToExternallyAccessibleSurface(IntPtr objectPointer);
 }
 

src/Drawie.Backend.Core/ColorsImpl/Paintables/TexturePaintable.cs

@@ -15,7 +15,7 @@ public class TexturePaintable : Paintable
 
     public override RectD LocalBounds => new RectD(0, 0, Image.Size.X, Image.Size.Y);
 
-    private Image lastSnapshot;
+    private Image? lastSnapshot;
 
     private bool disposeAfterUse;
 

src/Drawie.Backend.Core/Drawie.Backend.Core.csproj

@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <!--<WarningsAsErrors>CS8600;CS8601;CS8602;CS8604;CS8613;CS8614;CS8619;CS8620;CS8622;CS8625;CS8629;CS8633;CS8524;CS8509;CS8524;CS8767</WarningsAsErrors><!-->
   </PropertyGroup>
 
   <ItemGroup>

src/Drawie.Backend.Core/IRenderable.cs

@@ -0,0 +1,8 @@
+using Drawie.Backend.Core.Surfaces;
+
+namespace Drawie.Backend.Core;
+
+public interface IRenderable
+{
+    public void Draw(Canvas canvas);
+}

src/Drawie.Backend.Core/IRenderingDispatcher.cs

@@ -3,6 +3,7 @@
 public interface IRenderingDispatcher
 {
     public Action<Action> Invoke { get; }
+    protected internal void RenderApiReady();
     public Task<TResult> InvokeAsync<TResult>(Func<TResult> func);
     public Task<TResult> InvokeInBackgroundAsync<TResult>(Func<TResult> function);
     public Task InvokeInBackgroundAsync(Action function);