automatic client 1x/2x etc sizing should respect console and user AR options

BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs

@@ -251,6 +251,7 @@ namespace BizHawk.Client.EmuHawk
 			return new Point((int)v.X, (int)v.Y);
 		}
 
+
 		/// <summary>
 		/// This will receive an emulated output frame from an IVideoProvider and run it through the complete frame processing pipeline
 		/// Then it will stuff it into the bound PresentationPanel.
@@ -259,6 +260,45 @@ namespace BizHawk.Client.EmuHawk
 		/// Don't worry about the case where the frontend isnt using opengl; it isnt supported yet, and it will be my responsibility to deal with anyway
 		/// </summary>
 		public void UpdateSource(IVideoProvider videoProvider)
+		{
+			UpdateSourceInternal(videoProvider,false, GraphicsControl.Size);
+		}
+
+		class FakeVideoProvider : IVideoProvider
+		{
+			public int[] GetVideoBuffer() { return new int[] {}; }
+
+			public int VirtualWidth { get; set; }
+			public int VirtualHeight { get; set; }
+
+			public int BufferWidth { get; set; }
+			public int BufferHeight { get; set; }
+			public int BackgroundColor { get; set; }
+		}
+
+		/// <summary>
+		/// Attempts to calculate a good client size with the given zoom factor, considering the user's DisplayManager preferences
+		/// </summary>
+		public Size CalculateClientSize(IVideoProvider videoProvider, int zoom)
+		{
+			var fvp = new FakeVideoProvider ();
+			fvp.BufferWidth = videoProvider.BufferWidth;
+			fvp.BufferHeight = videoProvider.BufferHeight;
+			fvp.VirtualWidth = videoProvider.VirtualWidth;
+			fvp.VirtualHeight = videoProvider.VirtualHeight;
+
+			Size chain_outsize = new Size(fvp.BufferWidth * zoom, fvp.BufferHeight * zoom);
+			if (Global.Config.DispObeyAR && Global.Config.DispFixAspectRatio)
+				chain_outsize = new Size(fvp.VirtualWidth * zoom, fvp.VirtualHeight * zoom);
+
+			var filterProgram = UpdateSourceInternal(fvp, true, chain_outsize);
+
+			var size = filterProgram.Filters[filterProgram.Filters.Count - 1].FindOutput().SurfaceFormat.Size;
+
+			return size;
+		}
+
+		FilterManager.FilterProgram UpdateSourceInternal(IVideoProvider videoProvider, bool simulate, Size chain_outsize)
 		{
 			int vw = videoProvider.BufferWidth;
 			int vh = videoProvider.BufferHeight;
@@ -278,7 +318,9 @@ TESTEROO:
 
 
 			BitmapBuffer bb = null;
-			Texture2d videoTexture;
+			Texture2d videoTexture = null;
+			if (!simulate)
+			{
 				if (isGlTextureId)
 				{
 					videoTexture = GL.WrapGLTexture2d(new IntPtr(videoBuffer[0]), bufferWidth, bufferHeight);
@@ -299,6 +341,7 @@ TESTEROO:
 					videoBuffer = new int[1] { videoTexture.Id.ToInt32() };
 					goto TESTEROO;
 				}
+			}
 
 			//record the size of what we received, since lua and stuff is gonna want to draw onto it
 			currEmuWidth = bufferWidth;
@@ -306,26 +349,42 @@ TESTEROO:
 
 			//build the default filter chain and set it up with services filters will need
 			Size chain_insize = new Size(bufferWidth, bufferHeight);
-			Size chain_outsize = GraphicsControl.Size;
+
-			CurrentFilterProgram = BuildDefaultChain(chain_insize, chain_outsize);
+			FilterManager.FilterProgram filterProgram = BuildDefaultChain(chain_insize, chain_outsize);
-			CurrentFilterProgram.GuiRenderer = Renderer;
+			filterProgram.GuiRenderer = Renderer;
-			CurrentFilterProgram.GL = GL;
+			filterProgram.GL = GL;
-			//chain.RenderTargetProvider = new DisplayManagerRenderTargetProvider((size) => ShaderChainFrugalizers);
 
 			//setup the source image filter
-			Filters.SourceImage fInput = CurrentFilterProgram["input"] as Filters.SourceImage;
+			Filters.SourceImage fInput = filterProgram["input"] as Filters.SourceImage;
 			fInput.Texture = videoTexture;
 			
 			//setup the final presentation filter
-			Filters.FinalPresentation fPresent = CurrentFilterProgram["presentation"] as Filters.FinalPresentation;
+			Filters.FinalPresentation fPresent = filterProgram["presentation"] as Filters.FinalPresentation;
 			fPresent.VirtualTextureSize = new Size(vw, vh);
 			fPresent.TextureSize = new Size(bufferWidth, bufferHeight);
 			fPresent.BackgroundColor = videoProvider.BackgroundColor;
 			fPresent.GuiRenderer = Renderer;
 			fPresent.GL = GL;
 
-			CurrentFilterProgram.Compile("default", chain_insize, chain_outsize);
+			filterProgram.Compile("default", chain_insize, chain_outsize);
 
+			if (simulate)
+			{
+			}
+			else
+			{
+				CurrentFilterProgram = filterProgram;
+				UpdateSourceDrawingWork();
+			}
+
+			//cleanup:
+			if (bb != null) bb.Dispose();
+
+			return filterProgram;
+		}
+
+		void UpdateSourceDrawingWork()
+		{
 			//begin rendering on this context
 			//should this have been done earlier?
 			//do i need to check this on an intel video card to see if running excessively is a problem? (it used to be in the FinalTarget command below, shouldnt be a problem)
@@ -390,8 +449,6 @@ TESTEROO:
 			//nope. dont do this. workaround for slow context switching on intel GPUs. just switch to another context when necessary before doing anything
 			//presentationPanel.GraphicsControl.End();
 
-			//cleanup:
-			if(bb != null) bb.Dispose();
 			NeedsToPaint = false; //??
 		}
 

BizHawk.Client.EmuHawk/MainForm.cs

@@ -792,17 +792,19 @@ namespace BizHawk.Client.EmuHawk
 				int borderHeight = Size.Height - GlobalWin.PresentationPanel.Control.Size.Height;
 
 				// start at target zoom and work way down until we find acceptable zoom
+				Size lastComputedSize = new Size(1, 1);
 				for (; zoom >= 1; zoom--)
 				{
-					if ((((video.BufferWidth * zoom) + borderWidth) < area.Width)
+					lastComputedSize = GlobalWin.DisplayManager.CalculateClientSize(video, zoom);
-						&& (((video.BufferHeight * zoom) + borderHeight) < area.Height))
+					if ((((lastComputedSize.Width) + borderWidth) < area.Width)
+						&& (((lastComputedSize.Height) + borderHeight) < area.Height))
 					{
 						break;
 					}
 				}
 
 				// Change size
-				Size = new Size((video.BufferWidth * zoom) + borderWidth, ((video.BufferHeight * zoom) + borderHeight));
+				Size = new Size((lastComputedSize.Width) + borderWidth, ((lastComputedSize.Height) + borderHeight));
 				PerformLayout();
 				GlobalWin.PresentationPanel.Resized = true;