Merge pull request AvaloniaUI#5155 from AvaloniaUI/fixes/egl-init-win…

…dows [Windows] only enable egl by default on platforms where its stable.
SparkyTD · Dec 10, 2020 · 9af2cfa · 9af2cfa
2 parents cba74d5 + d20f90f
commit 9af2cfa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs
@@ -113,8 +113,7 @@ public static AppBuilder BuildAvaloniaApp()
                 })
                 .With(new Win32PlatformOptions
                 {
-                    EnableMultitouch = true,
-                    AllowEglInitialization = true
+                    EnableMultitouch = true
                 })
                 .UseSkia()
                 .UseManagedSystemDialogs()

diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -17,6 +17,7 @@
 using Avalonia.Rendering;
 using Avalonia.Threading;
 using Avalonia.Utilities;
+using Avalonia.Win32;
 using Avalonia.Win32.Input;
 using Avalonia.Win32.Interop;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
@@ -39,7 +40,7 @@ public static T UseWin32<T>(
     public class Win32PlatformOptions
     {
         public bool UseDeferredRendering { get; set; } = true;
-        public bool AllowEglInitialization { get; set; } = true;
+        public bool AllowEglInitialization { get; set; } = Win32Platform.WindowsVersion > new Version(6, 1);
         public bool? EnableMultitouch { get; set; }
         public bool OverlayPopups { get; set; }
         public bool UseWgl { get; set; }