From 22f9179ee76f0b6c91b5cd38ea90714386b2e9e5 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sat, 25 Feb 2017 02:56:46 -0600
Subject: [PATCH] fix #807 (GPGX double size option)

---
 .../Consoles/Sega/gpgx/GPGX.ISettable.cs      | 15 ++++--
 .../Consoles/Sega/gpgx/GPGX.IVideoProvider.cs | 49 +++++++++++++------
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.ISettable.cs
index 282a4cb415..ff6a0663a7 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.ISettable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.ISettable.cs
@@ -135,12 +135,21 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 
 			[DeepEqualsIgnore]
 			[JsonIgnore]
-			private bool _PadScreen320;
+			private bool _PadScreen320;
+
+			[DeepEqualsIgnore]
+			[JsonIgnore]
+			private bool _AlwaysDoubleSize;
 
 			[DisplayName("Pad screen to 320")]
-			[Description("Set to True to pads the screen out to be 320 when in 256 wide video modes")]
+			[Description("Set to True to pad the screen out to be 320 when in 256 wide video modes")]
 			[DefaultValue(false)]
-			public bool PadScreen320 { get { return _PadScreen320; } set { _PadScreen320 = value; } }
+			public bool PadScreen320 { get { return _PadScreen320; } set { _PadScreen320 = value; } }
+
+			[DisplayName("Always double-size")]
+			[Description("Set to True to convert the video to high-resolution mode even when it's low resolution so that the window doesn't change size between game modes")]
+			[DefaultValue(false)]
+			public bool AlwaysDoubleSize { get { return _AlwaysDoubleSize; } set { _AlwaysDoubleSize = value; } }
 
 			[DisplayName("Audio Filter")]
 			[DefaultValue(LibGPGX.InitSettings.FilterType.LowPass)]
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.IVideoProvider.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.IVideoProvider.cs
index 541e9aa037..6cbbd8a7f4 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.IVideoProvider.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.IVideoProvider.cs
@@ -45,11 +45,22 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 			//in case we're receiving high vertical resolution video, we shall double the horizontal resolution to keep the same proportions
 			//(concept pioneered for snes)
 
-			bool dotDouble = (gpheight == 448); //todo: pal?
-
+			bool dotDouble = (gpheight == 448); //todo: pal?
+			bool lineDouble = false;
+
 			vwidth = gpwidth;
 			vheight = gpheight;
 
+			if (_settings.AlwaysDoubleSize)
+			{
+				dotDouble = true;
+				if (gpheight == 224 || gpheight == 240)
+				{
+					lineDouble = true;
+					vheight *= 2;
+				}
+			}
+
 			if (_settings.PadScreen320 && vwidth == 256)
 				vwidth = 320;
 
@@ -65,6 +76,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 			if (dotDouble)
 				xskip = 2;
 
+			int lines = lineDouble ? 2: 1;
+
 			for (int D = 0; D < xskip; D++)
 			{
 				int rinc = (gppitch / 4) - gpwidth;
@@ -75,20 +88,26 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 
 					for (int j = 0; j < gpheight; j++)
 					{
-						for (int i = 0; i < xpad; i++)
+						int* ppsrc = psrc;
+						for (int L = 0; L < lines; L++)
 						{
-							*pdst = unchecked((int)0xff000000);
-							pdst += xskip;
-						}
-						for (int i = 0; i < gpwidth; i++)
-						{
-							*pdst = *psrc++;// | unchecked((int)0xff000000);
-							pdst += xskip;
-						}
-						for (int i = 0; i < xpad2; i++)
-						{
-							*pdst = unchecked((int)0xff000000);
-							pdst += xskip;
+							int* pppsrc = ppsrc;
+							for (int i = 0; i < xpad; i++)
+							{
+								*pdst = unchecked((int)0xff000000);
+								pdst += xskip;
+							}
+							for (int i = 0; i < gpwidth; i++)
+							{
+								*pdst = *pppsrc++;// | unchecked((int)0xff000000);
+								pdst += xskip;
+							}
+							for (int i = 0; i < xpad2; i++)
+							{
+								*pdst = unchecked((int)0xff000000);
+								pdst += xskip;
+							}
+							psrc = pppsrc;
 						}
 						psrc += rinc;
 					}