Browse Source

Added OpenGL as second render api

flabbet 9 months ago
parent
commit
11802c59fb
4 changed files with 68 additions and 35 deletions
  1. 1 1
      src/PixiDocks
  2. 4 2
      src/PixiEditor.Desktop/Program.cs
  3. 62 31
      src/PixiEditor.sln
  4. 1 1
      src/PixiParser

+ 1 - 1
src/PixiDocks

@@ -1 +1 @@
-Subproject commit 29ae0eff8a2a7d9070e6816cba8858ecac7abe9e
+Subproject commit ff4fdf7e67b75131eef961bb0f77c0710e24dae3

+ 4 - 2
src/PixiEditor.Desktop/Program.cs

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

+ 62 - 31
src/PixiEditor.sln

@@ -130,12 +130,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpirvCompiler", "Drawie\src
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia", "Drawie\src\Drawie.Interop.Avalonia\Drawie.Interop.Avalonia.csproj", "{6D79C3E3-E31F-43B4-B173-3E6959230923}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia", "Drawie\src\Drawie.Interop.Avalonia\Drawie.Interop.Avalonia.csproj", "{6D79C3E3-E31F-43B4-B173-3E6959230923}"
 EndProject
 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}"
 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
 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}"
 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
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.RenderApi.OpenGl", "Drawie\src\Drawie.RenderApi.OpenGl\Drawie.RenderApi.OpenGl.csproj", "{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia.Core", "Drawie\src\Drawie.Interop.Avalonia.Core\Drawie.Interop.Avalonia.Core.csproj", "{9CD22D8F-3F37-44F8-B106-7C1E02016F82}"
+EndProject
 Global
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Debug|x64 = Debug|x64
@@ -1111,34 +1113,6 @@ Global
 		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Steam|x64.Build.0 = 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.ActiveCfg = Debug|Any CPU
 		{6D79C3E3-E31F-43B4-B173-3E6959230923}.Steam|ARM64.Build.0 = 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.ActiveCfg = Debug|Any CPU
 		{843F55B4-987B-45A9-BDBD-1A0A86CB883E}.Debug|x64.Build.0 = 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.ActiveCfg = Debug|Any CPU
@@ -1195,6 +1169,62 @@ Global
 		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Steam|x64.Build.0 = 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.ActiveCfg = Debug|Any CPU
 		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Steam|ARM64.Build.0 = Debug|Any CPU
 		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Debug|x64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.MSIX|x64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Release|x64.ActiveCfg = Release|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Release|x64.Build.0 = Release|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Release|ARM64.Build.0 = Release|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Steam|x64.Build.0 = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C}.Steam|ARM64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Debug|x64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.DevRelease|x64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.DevRelease|x64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.DevRelease|ARM64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.DevSteam|x64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.DevSteam|x64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.DevSteam|ARM64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.MSIX Debug|x64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.MSIX|x64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.MSIX|x64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.MSIX|ARM64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Release|x64.ActiveCfg = Release|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Release|x64.Build.0 = Release|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Release|ARM64.Build.0 = Release|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Steam|x64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Steam|x64.Build.0 = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Steam|ARM64.ActiveCfg = Debug|Any CPU
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82}.Steam|ARM64.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 		HideSolutionNode = FALSE
@@ -1254,9 +1284,10 @@ Global
 		{1346AE27-CCC8-4BC6-A52D-05B6A657ACD2} = {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}
 		{475C7BBF-B10B-456A-A095-4395E49CF4B2} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
 		{6D79C3E3-E31F-43B4-B173-3E6959230923} = {E8A74431-F76F-43B1-BC66-CA05E249E6F4}
 		{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}
 		{843F55B4-987B-45A9-BDBD-1A0A86CB883E} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
 		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
 		{7BD495CA-2EB5-4ABC-BDDB-0E1765C40C19} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{FA293BD3-2D99-47BA-8C4F-53F4997CE99C} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
+		{9CD22D8F-3F37-44F8-B106-7C1E02016F82} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D04B4AB0-CA33-42FD-A909-79966F9255C5}
 		SolutionGuid = {D04B4AB0-CA33-42FD-A909-79966F9255C5}

+ 1 - 1
src/PixiParser

@@ -1 +1 @@
-Subproject commit 31ee9fa86c1900d541bc9d74ee2c3cb8952621b0
+Subproject commit 069637c38964746691a3416c1bcc88793b5554e1