tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Revert "Improved: D3D11 Adapter Creation Speed by Manually Selecting Hardware…" (#16063) 

This reverts commit af104b98e8.
fies/15433-itemscontrol-interactions-to-containers
Nikita Tsukanov 2 years ago
committed by GitHub
parent
0df64c5532
commit
42ec037e9a
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/Avalonia.OpenGL/OpenGlException.cs
  2. 64
      src/Windows/Avalonia.Win32/OpenGl/Angle/AngleWin32EglDisplay.cs

5
src/Avalonia.OpenGL/OpenGlException.cs
View File

@ -50,10 +50,5 @@ namespace Avalonia.OpenGL
return new OpenGlException($"{funcName} failed with error 0x{errorCode.ToString("X")}", intErrorCode);
}
}
/// <summary>
/// Throw helper that is used to allow callers to be inlined.
/// </summary>
public static OpenGlException ThrowFormattedException(string funcName, EglInterface egl) => throw GetFormattedEglException(funcName, egl.GetError());
}
}

64
src/Windows/Avalonia.Win32/OpenGl/Angle/AngleWin32EglDisplay.cs
View File

@ -59,7 +59,6 @@ namespace Avalonia.Win32.OpenGl.Angle
var dxgiFactoryGuid = MicroComRuntime.GetGuidFor(typeof(IDXGIFactory1));
DirectXUnmanagedMethods.CreateDXGIFactory1(ref dxgiFactoryGuid, out var pDxgiFactory);
IDXGIAdapter1? chosenAdapter = null;
if (pDxgiFactory != null)
{
using var factory = MicroComRuntime.CreateProxyFor<IDXGIFactory1>(pDxgiFactory, true);
@ -81,7 +80,7 @@ namespace Avalonia.Win32.OpenGl.Angle
}
if (adapters.Count == 0)
ThrowNoAdaptersFound();
throw new OpenGlException("No adapters found");
chosenAdapter = adapters
.OrderByDescending(x =>
@ -96,17 +95,21 @@ namespace Avalonia.Win32.OpenGl.Angle
else
{
if (factory.EnumAdapters1(0, &pAdapter) != 0)
ThrowNoAdaptersFound();
throw new OpenGlException("No adapters found");
chosenAdapter = MicroComRuntime.CreateProxyFor<IDXGIAdapter1>(pAdapter, true);
}
}
IntPtr pD3dDevice;
using (chosenAdapter)
pD3dDevice = CreateD3D11Device(chosenAdapter, featureLevels);
DirectXUnmanagedMethods.D3D11CreateDevice(chosenAdapter?.GetNativeIntPtr() ?? IntPtr.Zero,
D3D_DRIVER_TYPE.D3D_DRIVER_TYPE_UNKNOWN,
IntPtr.Zero, 0, featureLevels, (uint)featureLevels.Length,
7, out pD3dDevice, out _, null);
if (pD3dDevice == IntPtr.Zero)
ThrowCannotCreateD3D11Device();
throw new Win32Exception("Unable to create D3D11 Device");
var d3dDevice = MicroComRuntime.CreateProxyFor<ID3D11Device>(pD3dDevice, true);
var angleDevice = IntPtr.Zero;
@ -124,11 +127,11 @@ namespace Avalonia.Win32.OpenGl.Angle
{
angleDevice = egl.CreateDeviceANGLE(EGL_D3D11_DEVICE_ANGLE, pD3dDevice, null);
if (angleDevice == IntPtr.Zero)
OpenGlException.ThrowFormattedException("eglCreateDeviceANGLE", egl);
throw OpenGlException.GetFormattedException("eglCreateDeviceANGLE", egl);
display = egl.GetPlatformDisplayExt(EGL_PLATFORM_DEVICE_EXT, angleDevice, null);
if (display == IntPtr.Zero)
OpenGlException.ThrowFormattedException("eglGetPlatformDisplayEXT", egl);
throw OpenGlException.GetFormattedException("eglGetPlatformDisplayEXT", egl);
var rv = new AngleWin32EglDisplay(display, egl,
@ -152,53 +155,6 @@ namespace Avalonia.Win32.OpenGl.Angle
Cleanup();
}
}
// Throwhelpers to aid inlining on rare paths.
void ThrowNoAdaptersFound() => throw new OpenGlException("No adapters found");
void ThrowCannotCreateD3D11Device() => throw new Win32Exception("Unable to create D3D11 Device");
}
/// <summary>
/// Creates a D3D11 device for the given adapter.
/// </summary>
/// <returns>A null pointer on failure, otherwise a device pointer.</returns>
private static unsafe IntPtr CreateD3D11Device(IDXGIAdapter1? chosenAdapter, D3D_FEATURE_LEVEL[] featureLevels)
{
// https://learn.microsoft.com/en-us/windows/win32/api/dxgi/ns-dxgi-dxgi_adapter_desc1
// https://learn.microsoft.com/en-us/windows/win32/api/dxgi/ne-dxgi-dxgi_adapter_flag
var isSoftwareAdapter = (chosenAdapter!.Desc1.Flags & 2) == 1;
var driverType = isSoftwareAdapter ?
D3D_DRIVER_TYPE.D3D_DRIVER_TYPE_WARP :
D3D_DRIVER_TYPE.D3D_DRIVER_TYPE_HARDWARE;
// HARDWARE or WARP should cover ~99% of use cases.
DirectXUnmanagedMethods.D3D11CreateDevice(chosenAdapter?.GetNativeIntPtr() ?? IntPtr.Zero,
driverType,
IntPtr.Zero, 0, featureLevels, (uint)featureLevels.Length,
7, out var pD3dDevice, out _, null);
if (pD3dDevice != IntPtr.Zero)
return pD3dDevice;
// Otherwise fallback to legacy software device.
DirectXUnmanagedMethods.D3D11CreateDevice(chosenAdapter?.GetNativeIntPtr() ?? IntPtr.Zero,
D3D_DRIVER_TYPE.D3D_DRIVER_TYPE_SOFTWARE,
IntPtr.Zero, 0, featureLevels, (uint)featureLevels.Length,
7, out pD3dDevice, out _, null);
if (pD3dDevice != IntPtr.Zero)
return pD3dDevice;
// As a last resort, try creating an unknown device.
// No consumer machine ought to hit this, the remaining options
// are more so for driver developers debugging/testing, but
// we might as well cover this base.
DirectXUnmanagedMethods.D3D11CreateDevice(chosenAdapter?.GetNativeIntPtr() ?? IntPtr.Zero,
D3D_DRIVER_TYPE.D3D_DRIVER_TYPE_UNKNOWN,
IntPtr.Zero, 0, featureLevels, (uint)featureLevels.Length,
7, out pD3dDevice, out _, null);
return pD3dDevice;
}
private AngleWin32EglDisplay(IntPtr display, EglInterface egl, EglDisplayOptions options, AngleOptions.PlatformApi platformApi) : base(display, options)

Write Preview
Loading…
Cancel
Save