From ddf9a70bcf952d65b185c42a75498fefe4a263bb Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Mon, 20 May 2024 22:10:49 -0700
Subject: [PATCH] Do minor cleanups with D3D11 handling

---
 .../D3D11/D3D11GLInterop.cs                   | 24 +++++++++----------
 .../D3D11/IGL_D3D11.cs                        |  4 ++--
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/BizHawk.Bizware.Graphics/D3D11/D3D11GLInterop.cs b/src/BizHawk.Bizware.Graphics/D3D11/D3D11GLInterop.cs
index 3a21ada274..71c5e569f1 100644
--- a/src/BizHawk.Bizware.Graphics/D3D11/D3D11GLInterop.cs
+++ b/src/BizHawk.Bizware.Graphics/D3D11/D3D11GLInterop.cs
@@ -58,7 +58,7 @@ namespace BizHawk.Bizware.Graphics
 						return;
 					}
 
-					// note: Silk.NET's WGL.IsExtensionPresent function seemed to be bugged and just result in NREs...
+					// note: Silk.NET's WGL.IsExtensionPresent function seems to be bugged and just results in NREs...
 					NVDXInterop = new(new LamdaNativeContext(SDL2OpenGLContext.GetGLProcAddress));
 					if (NVDXInterop.CurrentVTable.Load("wglDXOpenDeviceNV") == IntPtr.Zero
 						|| NVDXInterop.CurrentVTable.Load("wglDXCloseDeviceNV") == IntPtr.Zero
@@ -122,6 +122,7 @@ namespace BizHawk.Bizware.Graphics
 		}
 
 		private readonly D3D11Resources _resources;
+		private ID3D11Device Device => _resources.Device;
 
 		private IntPtr _dxInteropDevice;
 		private IntPtr _lastGLContext;
@@ -131,18 +132,15 @@ namespace BizHawk.Bizware.Graphics
 
 		public D3D11GLInterop(D3D11Resources resources)
 		{
-			using (new SavedOpenGLContext())
+			_resources = resources;
+			try
 			{
-				_resources = resources;
-				try
-				{
-					OpenInteropDevice();
-				}
-				catch
-				{
-					Dispose();
-					throw;
-				}
+				OpenInteropDevice();
+			}
+			catch
+			{
+				Dispose();
+				throw;
 			}
 		}
 
@@ -150,7 +148,7 @@ namespace BizHawk.Bizware.Graphics
 		{
 			unsafe
 			{
-				_dxInteropDevice = NVDXInterop.DxopenDevice((void*)_resources.Device.NativePointer);
+				_dxInteropDevice = NVDXInterop.DxopenDevice((void*)Device.NativePointer);
 			}
 
 			if (_dxInteropDevice == IntPtr.Zero)
diff --git a/src/BizHawk.Bizware.Graphics/D3D11/IGL_D3D11.cs b/src/BizHawk.Bizware.Graphics/D3D11/IGL_D3D11.cs
index a4c53dbb93..8e919770bf 100644
--- a/src/BizHawk.Bizware.Graphics/D3D11/IGL_D3D11.cs
+++ b/src/BizHawk.Bizware.Graphics/D3D11/IGL_D3D11.cs
@@ -20,10 +20,10 @@ namespace BizHawk.Bizware.Graphics
 		// these might need to be thrown out and recreated if the device is lost
 		private readonly D3D11Resources _resources;
 
-		private IDXGIFactory1 Factory1 => _resources.Factory1;
-		private IDXGIFactory2 Factory2 => _resources.Factory2;
 		private ID3D11Device Device => _resources.Device;
 		private ID3D11DeviceContext Context => _resources.Context;
+		private IDXGIFactory1 Factory1 => _resources.Factory1;
+		private IDXGIFactory2 Factory2 => _resources.Factory2;
 		private ID3D11BlendState BlendEnableState => _resources.BlendEnableState;
 		private ID3D11BlendState BlendDisableState => _resources.BlendDisableState;
 		private ID3D11RasterizerState RasterizerState => _resources.RasterizerState;