From 39a82ce66e2c8e2d11226d6a0e7a2557b20380d4 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sat, 5 Sep 2020 12:21:20 +0100 Subject: [PATCH] Remove WGL option. --- src/Avalonia.OpenGL/AngleOptions.cs | 3 +-- src/Avalonia.OpenGL/EglDisplay.cs | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Avalonia.OpenGL/AngleOptions.cs b/src/Avalonia.OpenGL/AngleOptions.cs index 40a673b574..84744288ed 100644 --- a/src/Avalonia.OpenGL/AngleOptions.cs +++ b/src/Avalonia.OpenGL/AngleOptions.cs @@ -7,8 +7,7 @@ namespace Avalonia.OpenGL public enum PlatformApi { DirectX9, - DirectX11, - WGL + DirectX11 } public IList AllowedPlatformApis { get; set; } = null; diff --git a/src/Avalonia.OpenGL/EglDisplay.cs b/src/Avalonia.OpenGL/EglDisplay.cs index 55d0ebb59a..ce5fd50a07 100644 --- a/src/Avalonia.OpenGL/EglDisplay.cs +++ b/src/Avalonia.OpenGL/EglDisplay.cs @@ -38,7 +38,6 @@ namespace Avalonia.OpenGL var allowedApis = AvaloniaLocator.Current.GetService()?.AllowedPlatformApis ?? new [] { - AngleOptions.PlatformApi.WGL, AngleOptions.PlatformApi.DirectX11, AngleOptions.PlatformApi.DirectX9 }; @@ -50,8 +49,6 @@ namespace Avalonia.OpenGL dapi = EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE; else if (platformApi == AngleOptions.PlatformApi.DirectX11) dapi = EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE; - else if (platformApi == AngleOptions.PlatformApi.WGL) - dapi = EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE; else continue;