Adjusted api for interop

src/Drawie

@@ -1 +1 @@
-Subproject commit 479031ffc550a71821b673c03014affdfa40d570
+Subproject commit 19b1172b9c2398e80292076fe422579aa71db75f

src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj

@@ -45,7 +45,7 @@
   <Target Name="GenerateProtoContracts" BeforeTargets="BeforeCompile"
           Inputs="$(MSBuildProjectDirectory)\DataContracts\*.proto"
           Outputs="$(MSBuildProjectDirectory)\ProtoAutogen\*.cs">
-    <Exec Command="dotnet tool run protogen --csharp_out=ProtoAutogen --proto_path=DataContracts +listset=yes *.proto"/>
+    <Exec Command="dotnet tool run --allow-roll-forward protogen --csharp_out=ProtoAutogen --proto_path=DataContracts +listset=yes *.proto"/>
 
     <ItemGroup>
       <Compile Include="ProtoAutogen\*.cs" KeepDuplicates="false"/>

src/PixiEditor.sln

@@ -112,8 +112,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.SVG", "PixiEdito
 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}"
@@ -130,6 +128,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.RenderApi.Vulkan", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpirvCompiler", "Drawie\src\SpirvCompiler\SpirvCompiler.csproj", "{475C7BBF-B10B-456A-A095-4395E49CF4B2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia", "Drawie\src\Drawie.Interop.Avalonia\Drawie.Interop.Avalonia.csproj", "{6D79C3E3-E31F-43B4-B173-3E6959230923}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia.Core", "Drawie\src\Drawie.Interop.Avalonia.Core\Drawie.Interop.Avalonia.Core.csproj", "{22FFC778-6DFC-441C-882A-03BD8C0E3090}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia.OpenGl", "Drawie\src\Drawie.Interop.Avalonia.OpenGl\Drawie.Interop.Avalonia.OpenGl.csproj", "{843F55B4-987B-45A9-BDBD-1A0A86CB883E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia.Vulkan", "Drawie\src\Drawie.Interop.Avalonia.Vulkan\Drawie.Interop.Avalonia.Vulkan.csproj", "{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -853,34 +859,6 @@ 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
@@ -1105,6 +1083,118 @@ Global
 		{475C7BBF-B10B-456A-A095-4395E49CF4B2}.Steam|x64.Build.0 = Debug|Any CPU
 		{475C7BBF-B10B-456A-A095-4395E49CF4B2}.Steam|ARM64.ActiveCfg = Debug|Any CPU
 		{475C7BBF-B10B-456A-A095-4395E49CF4B2}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Debug|x64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.MSIX|x64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Release|x64.ActiveCfg = Release|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Release|x64.Build.0 = Release|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Release|ARM64.Build.0 = Release|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Steam|x64.Build.0 = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Debug|x64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.MSIX|x64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Release|x64.ActiveCfg = Release|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Release|x64.Build.0 = Release|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Release|ARM64.Build.0 = Release|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Steam|x64.Build.0 = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Debug|x64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.MSIX|x64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Release|x64.ActiveCfg = Release|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Release|x64.Build.0 = Release|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Release|ARM64.Build.0 = Release|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Steam|x64.Build.0 = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Debug|x64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.MSIX|x64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Release|x64.ActiveCfg = Release|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Release|x64.Build.0 = Release|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Release|ARM64.Build.0 = Release|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Steam|x64.Build.0 = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Steam|ARM64.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1155,7 +1245,6 @@ Global
 		{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}
@@ -1164,6 +1253,10 @@ Global
 		{21152CEE-F9D7-452F-9FF5-B15FF80F2CED} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
 		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
 		{475C7BBF-B10B-456A-A095-4395E49CF4B2} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{6D79C3E3-E31F-43B4-B173-3E6959230923} = {E8A74431-F76F-43B1-BC66-CA05E249E6F4}
+		{22FFC778-6DFC-441C-882A-03BD8C0E3090} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{843F55B4-987B-45A9-BDBD-1A0A86CB883E} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D04B4AB0-CA33-42FD-A909-79966F9255C5}

src/PixiEditor/PixiEditor.csproj

@@ -104,7 +104,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Drawie\src\Drawie.Interop.VulkanAvalonia\Drawie.Interop.VulkanAvalonia.csproj" />
+    <ProjectReference Include="..\Drawie\src\Drawie.Interop.Avalonia\Drawie.Interop.Avalonia.csproj" />
+    <ProjectReference Include="..\Drawie\src\Drawie.Interop.Avalonia.Core\Drawie.Interop.Avalonia.Core.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"/>

src/PixiEditor/ViewModels/SubViewModels/ViewportWindowViewModel.cs

@@ -1,13 +1,8 @@
 using System.ComponentModel;
-using System.Threading.Tasks;
 using Avalonia.Threading;
-using CommunityToolkit.Mvvm.Input;
 using PixiDocks.Core.Docking;
 using PixiDocks.Core.Docking.Events;
-using Drawie.Backend.Core.Numerics;
-using Drawie.Interop.VulkanAvalonia.Controls;
 using PixiEditor.Helpers.UI;
-using PixiEditor.Models.Controllers.InputDevice;
 using PixiEditor.Models.DocumentModels;
 using Drawie.Numerics;
 using PixiEditor.ViewModels.Dock;

src/PixiEditor/Views/Rendering/Scene.cs

@@ -13,15 +13,13 @@ using Avalonia.Skia;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 using ChunkyImageLib.DataHolders;
-using PixiEditor.ChangeableDocument.Rendering;
 using Drawie.Backend.Core;
 using Drawie.Backend.Core.Bridge;
 using Drawie.Backend.Core.Numerics;
 using Drawie.Backend.Core.Shaders;
 using Drawie.Backend.Core.Surfaces;
 using Drawie.Backend.Core.Surfaces.PaintImpl;
-using Drawie.Interop.VulkanAvalonia;
-using Drawie.Interop.VulkanAvalonia.Vulkan;
+using Drawie.Interop.Avalonia.Core;
 using PixiEditor.Extensions.UI.Overlays;
 using PixiEditor.Helpers;
 using PixiEditor.Helpers.Converters;
@@ -128,7 +126,7 @@ internal class Scene : Zoombox.Zoombox, ICustomHitTest
 
     private string info = string.Empty;
     private bool initialized = false;
-    private VulkanResources resources;
+    private RenderApiResources resources;
     private DrawingSurface renderSurface;
     private PixelSize lastSize = PixelSize.Empty;
     private Cursor lastCursor;
@@ -205,7 +203,7 @@ internal class Scene : Zoombox.Zoombox, ICustomHitTest
             {
                 return;
             }
-            
+
             compositor = selfVisual.Compositor;
 
             surface = compositor.CreateDrawingSurface();
@@ -236,7 +234,7 @@ internal class Scene : Zoombox.Zoombox, ICustomHitTest
     public void Draw(DrawingSurface renderTexture)
     {
         if (Document == null || SceneRenderer == null) return;
-        
+
         renderTexture.Canvas.Save();
         var matrix = CalculateTransformMatrix();
 
@@ -564,10 +562,7 @@ internal class Scene : Zoombox.Zoombox, ICustomHitTest
     protected (bool success, string info) InitializeGraphicsResources(Compositor targetCompositor,
         CompositionDrawingSurface compositionDrawingSurface, ICompositionGpuInterop interop)
     {
-        resources = new VulkanResources(
-            DrawieInterop.VulkanInteropContext,
-            new VulkanSwapchain(DrawieInterop.VulkanInteropContext, interop, compositionDrawingSurface),
-            new VulkanContent(DrawieInterop.VulkanInteropContext));
+        resources = IDrawieInteropContext.Current.CreateResources(compositionDrawingSurface, interop);
 
         return (true, string.Empty);
     }
@@ -580,7 +575,7 @@ internal class Scene : Zoombox.Zoombox, ICustomHitTest
         resources = null;
     }
 
-    protected void RenderFrame(PixelSize size)
+    protected  void RenderFrame(PixelSize size)
     {
         if (resources != null)
         {
@@ -591,7 +586,7 @@ internal class Scene : Zoombox.Zoombox, ICustomHitTest
 
             if (renderSurface == null || lastSize != size)
             {
-                resources.Content.CreateTemporalObjects(size);
+                resources.CreateTemporalObjects(size);
 
                 VecI sizeVec = new VecI(size.Width, size.Height);
 
@@ -599,19 +594,17 @@ internal class Scene : Zoombox.Zoombox, ICustomHitTest
 
                 renderSurface =
                     DrawingBackendApi.Current.CreateRenderSurface(sizeVec,
-                        resources.Content.texture, SurfaceOrigin.BottomLeft);
+                        resources.Texture, SurfaceOrigin.BottomLeft);
 
                 lastSize = size;
             }
 
-            using (resources.Swapchain.BeginDraw(size, out var image))
+            resources.Render(size, () =>
             {
                 renderSurface.Canvas.Clear();
                 Draw(renderSurface);
                 renderSurface.Flush();
-
-                resources.Content.Render(image);
-            }
+            });
         }
     }
 

src/PixiEditor/Views/Visuals/PreviewPainterControl.cs

@@ -1,11 +1,7 @@
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Skia;
 using ChunkyImageLib.DataHolders;
 using Drawie.Backend.Core.Surfaces;
-using Drawie.Interop.VulkanAvalonia.Controls;
+using Drawie.Interop.Avalonia.Core.Controls;
 using PixiEditor.Models.Rendering;
 using Drawie.Numerics;
 

src/PixiEditor/Views/Visuals/TextureControl.cs

@@ -1,14 +1,8 @@
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Media;
-using Avalonia.Rendering.SceneGraph;
-using Avalonia.Skia;
 using Avalonia.Threading;
 using Drawie.Backend.Core;
-using Drawie.Backend.Core.Bridge;
-using Drawie.Backend.Core.Surfaces;
-using Drawie.Backend.Core.Surfaces.PaintImpl;
-using Drawie.Interop.VulkanAvalonia.Controls;
+using Drawie.Interop.Avalonia.Core.Controls;
 using Drawie.Numerics;
 
 namespace PixiEditor.Views.Visuals;