2
0
flabbet 9 сар өмнө
parent
commit
37388a7414

+ 3 - 0
.gitmodules

@@ -4,3 +4,6 @@
 [submodule "src/PixiParser"]
 	path = src/PixiParser
 	url = https://github.com/PixiEditor/PixiParser.git
+[submodule "src/Drawie"]
+	path = src/Drawie
+	url = https://github.com/PixiEditor/Drawie.git

+ 1 - 1
src/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <CodeAnalysisRuleSet>../Custom.ruleset</CodeAnalysisRuleSet>
-		    <AvaloniaVersion>11.1.3</AvaloniaVersion>
+		    <AvaloniaVersion>11.1.4</AvaloniaVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />

+ 1 - 0
src/Drawie

@@ -0,0 +1 @@
+Subproject commit 232bb1acc4e132bc85f1038d45c17c20d67ef48e

+ 5 - 3
src/PixiEditor.Desktop/Program.cs

@@ -18,9 +18,11 @@ public class Program
             .UsePlatformDetect()
             .With(new Win32PlatformOptions()
             {
-                RenderingMode = new Win32RenderingMode[] { Win32RenderingMode.Wgl, Win32RenderingMode.AngleEgl },
-                OverlayPopups = true
+                RenderingMode = new Win32RenderingMode[] { Win32RenderingMode.Vulkan },
+            })
+            .With(new X11PlatformOptions()
+            {
+                RenderingMode = new X11RenderingMode[] { X11RenderingMode.Vulkan },
             })
-           
             .LogToTrace();
 }

+ 251 - 0
src/PixiEditor.sln

@@ -116,6 +116,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiParser", "PixiParser\sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.SVG", "PixiEditor.SVG\PixiEditor.SVG.csproj", "{786E1F87-4A10-493E-88BD-3F2461DBFCA0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drawie", "Drawie", "{03CFB32D-E797-41B1-B072-A4FEBA5F8813}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.VulkanAvalonia", "Drawie\src\Drawie.Interop.VulkanAvalonia\Drawie.Interop.VulkanAvalonia.csproj", "{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Numerics", "Drawie\src\Drawie.Numerics\Drawie.Numerics.csproj", "{8064811C-6A34-456E-A3F2-D77395009A29}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawiEngine", "Drawie\src\DrawiEngine\DrawiEngine.csproj", "{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Backend.Skia", "Drawie\src\Drawie.Backend.Skia\Drawie.Backend.Skia.csproj", "{52D94AD9-889A-4E80-861B-1DDE7E226F30}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Backend.Core", "Drawie\src\Drawie.Backend.Core\Drawie.Backend.Core.csproj", "{381734AE-F811-4544-AF85-49D8C0ABE1AE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Windowing", "Drawie\src\Drawie.Windowing\Drawie.Windowing.csproj", "{467EDEB3-6004-46B8-8448-2F5C4F131D75}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.RenderApi", "Drawie\src\Drawie.RenderApi\Drawie.RenderApi.csproj", "{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.RenderApi.Vulkan", "Drawie\src\Drawie.RenderApi.Vulkan\Drawie.RenderApi.Vulkan.csproj", "{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -879,6 +897,230 @@ Global
 		{CD863C88-72E3-40F4-9AAE-5696BBB4460C}.Steam|ARM64.Build.0 = Release|arm64
 		{CD863C88-72E3-40F4-9AAE-5696BBB4460C}.Steam|x64.ActiveCfg = Release|x64
 		{CD863C88-72E3-40F4-9AAE-5696BBB4460C}.Steam|x64.Build.0 = Release|x64
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Debug|x64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.MSIX|x64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Release|x64.ActiveCfg = Release|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Release|x64.Build.0 = Release|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Release|ARM64.Build.0 = Release|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Steam|x64.Build.0 = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Debug|x64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.MSIX|x64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Release|x64.ActiveCfg = Release|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Release|x64.Build.0 = Release|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Release|ARM64.Build.0 = Release|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Steam|x64.Build.0 = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{8064811C-6A34-456E-A3F2-D77395009A29}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Debug|x64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.MSIX|x64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Release|x64.ActiveCfg = Release|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Release|x64.Build.0 = Release|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Release|ARM64.Build.0 = Release|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Steam|x64.Build.0 = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Debug|x64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.MSIX|x64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Release|x64.ActiveCfg = Release|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Release|x64.Build.0 = Release|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Release|ARM64.Build.0 = Release|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Steam|x64.Build.0 = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.MSIX|x64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Release|x64.Build.0 = Release|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Release|ARM64.Build.0 = Release|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Steam|x64.Build.0 = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Debug|x64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.MSIX|x64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Release|x64.ActiveCfg = Release|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Release|x64.Build.0 = Release|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Release|ARM64.Build.0 = Release|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Steam|x64.Build.0 = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Debug|x64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.MSIX|x64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Release|x64.ActiveCfg = Release|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Release|x64.Build.0 = Release|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Release|ARM64.Build.0 = Release|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Steam|x64.Build.0 = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Debug|x64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.MSIX|x64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Release|x64.ActiveCfg = Release|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Release|x64.Build.0 = Release|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Release|ARM64.Build.0 = Release|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Steam|x64.Build.0 = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2}.Steam|ARM64.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -931,6 +1173,15 @@ Global
 		{47BC7BC5-C070-49F4-8C8C-542DEDFC78B5} = {E8A74431-F76F-43B1-BC66-CA05E249E6F4}
 		{0D3DE5D1-D984-407D-B2A6-7945F011B636} = {E8A74431-F76F-43B1-BC66-CA05E249E6F4}
 		{786E1F87-4A10-493E-88BD-3F2461DBFCA0} = {1E816135-76C1-4255-BE3C-BF17895A65AA}
+		{03CFB32D-E797-41B1-B072-A4FEBA5F8813} = {E8A74431-F76F-43B1-BC66-CA05E249E6F4}
+		{BD5582AA-7694-4F10-BB5D-1435B9BC8E21} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{8064811C-6A34-456E-A3F2-D77395009A29} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{95D13D61-FBE6-4E10-9716-EDD749D0AEFC} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{52D94AD9-889A-4E80-861B-1DDE7E226F30} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{381734AE-F811-4544-AF85-49D8C0ABE1AE} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{467EDEB3-6004-46B8-8448-2F5C4F131D75} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D04B4AB0-CA33-42FD-A909-79966F9255C5}

+ 1 - 0
src/PixiEditor/PixiEditor.csproj

@@ -104,6 +104,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Drawie\src\Drawie.Interop.VulkanAvalonia\Drawie.Interop.VulkanAvalonia.csproj" />
     <ProjectReference Include="..\PixiDocks\src\PixiDocks.Avalonia\PixiDocks.Avalonia.csproj"/>
     <ProjectReference Include="..\PixiEditor.SVG\PixiEditor.SVG.csproj" />
     <ProjectReference Include="..\PixiParser\src\PixiParser.Skia\PixiParser.Skia.csproj"/>