fix saturn PixelPro resolution management mode to reformat framebuffer to requirements, so it works like it's supposed to

BizHawk.Client.EmuHawk/config/PSX/PSXOptions.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="lblTweakedMednafen.Text" xml:space="preserve">
-    <value>Displays all content at as multiple of 400x300.
+    <value>Displays all content at a multiple of 400x300.
  • Correct aspect ratio
  • Generally enjoyable game presentation
  • Detail loss at 1x in fewer cases
@@ -127,7 +127,7 @@
 </value>
   </data>
   <data name="lblMednafen.Text" xml:space="preserve">
-    <value>Displays all content at as multiple of 320x240
+    <value>Displays all content at a multiple of 320x240
  • Correct aspect ratio
  • Generally enjoyable game presentation
  • At 1x window size, detail can be lost

BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs

@@ -618,12 +618,28 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 		public override int VirtualWidth => _virtualWidth;
 		public override int VirtualHeight => _virtualHeight;
 
-		protected override void FrameAdvancePost()
+		bool _useResizedBuffer;
+		int[] _resizedBuffer;
+
+		public override int[] GetVideoBuffer()
+		{
+			if (_useResizedBuffer) return _resizedBuffer;
+			else return _videoBuffer;
+		}
+
+		void AllocResizedBuffer(int width, int height)
+		{
+			_useResizedBuffer = true;
+			if (_resizedBuffer == null || width * height != _resizedBuffer.Length)
+				_resizedBuffer = new int[width * height];
+		}
+
+		protected unsafe override void FrameAdvancePost()
 		{
 			//TODO: can we force the videoprovider to add a prescale instead of having to do it in software here?
 			//TODO: if not, actually do it in software, instead of relying on the virtual sizes
 			//TODO: find a reason why relying on the virtual sizes is actually not good enough?
-			
+
 			//TODO: export VDP2 display area width from emulator and add option to aggressively crop overscan - OR - add that logic to core
 
 			//mednafen, for reference:
@@ -646,6 +662,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 			//	gi->lcm_width = gi->nominal_width * 2;
 			//}
 
+			_useResizedBuffer = false;
+
 			bool isHorz2x = false, isVert2x = false;
 
 			//note: these work with PAL also
@@ -666,6 +684,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 			if (BufferHeight == slHeight) { }
 			else isVert2x = true;
 
+			if (_settings.ResolutionMode == Settings.ResolutionModeTypes.PixelPro)
+			{
+				//this is the tricky one: need to adapt the framebuffer size
+			}
+
 			switch (_settings.ResolutionMode)
 			{
 				case Settings.ResolutionModeTypes.HardcoreDebug:
@@ -713,6 +736,58 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 					//(that's not the best solution for us [not what psx does], but it will do for now)
 					_virtualWidth = BufferWidth * (isHorz2x ? 1 : 2); //not a mistake, we scale to make it bigger if it isn't already
 					_virtualHeight = BufferHeight * (isVert2x ? 1 : 2); //not a mistake
+
+					if (isHorz2x && isVert2x) { } //nothing to do
+					else if (isHorz2x && !isVert2x)
+					{
+						//needs double sizing vertically
+						AllocResizedBuffer(_virtualWidth, _virtualHeight);
+						for (int y = 0; y < BufferHeight; y++)
+						{
+							Buffer.BlockCopy(_videoBuffer, BufferWidth * y * 4, _resizedBuffer, BufferWidth * (y * 2 + 0) * 4, BufferWidth * 4);
+							Buffer.BlockCopy(_videoBuffer, BufferWidth * y * 4, _resizedBuffer, BufferWidth * (y * 2 + 1) * 4, BufferWidth * 4);
+						}
+					}
+					else if (!isHorz2x && isVert2x)
+					{
+						//needs double sizing horizontally
+						AllocResizedBuffer(_virtualWidth, _virtualHeight);
+						fixed (int* _pdst = &_resizedBuffer[0])
+						{
+							fixed (int* _psrc = &_videoBuffer[0])
+							{
+								int* psrc = _psrc;
+								int* pdst = _pdst;
+								for (int y = 0; y < BufferHeight; y++)
+								{
+									for (int x = 0; x < BufferWidth; x++) { *pdst++ = *psrc; *pdst++ = *psrc++; }
+								}
+							}
+						}
+					}
+					else
+					{
+						//needs double sizing horizontally and vertically
+						AllocResizedBuffer(_virtualWidth, _virtualHeight);
+						fixed (int* _pdst = &_resizedBuffer[0])
+						{
+							fixed (int* _psrc = &_videoBuffer[0])
+							{
+								int* psrc = _psrc;
+								int* pdst = _pdst;
+								for (int y = 0; y < BufferHeight; y++)
+								{
+									for (int x = 0; x < BufferWidth; x++) { *pdst++ = psrc[x]; *pdst++ = psrc[x]; }
+									for (int x = 0; x < BufferWidth; x++) { *pdst++ = psrc[x]; *pdst++ = psrc[x]; }
+									psrc += BufferWidth;
+								}
+							}
+						}
+					}
+
+					BufferWidth = _virtualWidth;
+					BufferHeight = _virtualHeight;
+
 					break;
 			}
 

BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs

@@ -367,7 +367,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
 
 		#region IVideoProvider
 
-		public int[] GetVideoBuffer()
+		public virtual int[] GetVideoBuffer()
 		{
 			return _videoBuffer;
 		}