Decouple IGL_GdiPlus from GLControlWrapper_GdiPlus

src/BizHawk.Bizware.BizwareGL/IGraphicsControl.cs

@@ -7,6 +7,8 @@ namespace BizHawk.Bizware.BizwareGL
 	{
 		Rectangle ClientRectangle { get; }
 
+		RenderTargetWrapper RenderTargetWrapper { get; set; }
+
 		Graphics CreateGraphics();
 
 		/// <summary>

src/BizHawk.Bizware.DirectX/GLControlWrapper_SlimDX9.cs

@@ -8,6 +8,12 @@ namespace BizHawk.Bizware.DirectX
 {
 	public sealed class GLControlWrapperSlimDX9 : Control, IGraphicsControl
 	{
+		public RenderTargetWrapper RenderTargetWrapper
+		{
+			get => throw new NotImplementedException();
+			set => throw new NotImplementedException();
+		}
+
 		public GLControlWrapperSlimDX9(IGL_SlimDX9 sdx)
 		{
 			_sdx = sdx;

src/BizHawk.Bizware.OpenTK3/GraphicsControl_TK.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Windows.Forms;
 
 using BizHawk.Bizware.BizwareGL;
@@ -9,6 +10,12 @@ namespace BizHawk.Bizware.OpenTK3
 {
 	internal class GLControlWrapper : GLControl, IGraphicsControl
 	{
+		public RenderTargetWrapper RenderTargetWrapper
+		{
+			get => throw new NotImplementedException();
+			set => throw new NotImplementedException();
+		}
+
 		// Note: In order to work around bugs in OpenTK which sometimes do things to a context without making that context active first...
 		// we are going to push and pop the context before doing stuff
 		public GLControlWrapper(IGL_TK owner)

src/BizHawk.Client.EmuHawk/GraphicsImplementations/GLControlWrapper_GdiPlus.cs

@@ -23,7 +23,7 @@ namespace BizHawk.Client.EmuHawk
 		/// <summary>
 		/// the render target for rendering to this control
 		/// </summary>
-		public RenderTargetWrapper RenderTargetWrapper;
+		public RenderTargetWrapper RenderTargetWrapper { get; set; }
 
 		public void SetVsync(bool state)
 		{

src/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_GdiPlus.cs

@@ -15,6 +15,11 @@ namespace BizHawk.Client.EmuHawk
 		// rendering state
 		private RenderTarget _currRenderTarget;
 
+		private readonly Func<IGL_GdiPlus, IGraphicsControl> _createGLControlWrapper;
+
+		public IGL_GdiPlus(Func<IGL_GdiPlus, IGraphicsControl> createGLControlWrapper)
+			=> _createGLControlWrapper = createGLControlWrapper;
+
 		void IDisposable.Dispose()
 		{
 		}
@@ -232,17 +237,17 @@ namespace BizHawk.Client.EmuHawk
 			SetViewport(size.Width, size.Height);
 		}
 	
-		public void BeginControl(GLControlWrapper_GdiPlus control)
+		public void BeginControl(IGraphicsControl control)
 		{
 			CurrentControl = control;
 		}
 
-		public void EndControl(GLControlWrapper_GdiPlus control)
+		public void EndControl(IGraphicsControl control)
 		{
 			CurrentControl = null;
 		}
 
-		public void SwapControl(GLControlWrapper_GdiPlus control)
+		public void SwapControl(IGraphicsControl control)
 		{
 		}
 
@@ -259,7 +264,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public IGraphicsControl Internal_CreateGraphicsControl()
 		{
-			var ret = new GLControlWrapper_GdiPlus(this);
+			var ret = _createGLControlWrapper(this);
 			
 			// create a render target for this control
 			var rtw = new RenderTargetWrapper(() => MyBufferedGraphicsContext, ret);
@@ -334,7 +339,7 @@ namespace BizHawk.Client.EmuHawk
 			return rtw.MyBufferedGraphics.Graphics;
 		}
 
-		public GLControlWrapper_GdiPlus CurrentControl;
+		public IGraphicsControl CurrentControl;
 		public RenderTargetWrapper CurrentRenderTargetWrapper;
 
 		public readonly BufferedGraphicsContext MyBufferedGraphicsContext = new();

src/BizHawk.Client.EmuHawk/Program.cs

@@ -186,7 +186,7 @@ namespace BizHawk.Client.EmuHawk
 						return CheckRenderer(glOpenTK);
 					default:
 					case EDispMethod.GdiPlus:
-						return new IGL_GdiPlus();
+						return new IGL_GdiPlus(self => new GLControlWrapper_GdiPlus(self));
 				}
 			}