From de85a6fdefd350be553b5e8caff5e85a07a2d5bf Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Thu, 17 Sep 2015 16:49:30 -0500
Subject: [PATCH] gpgx - handle virtualwidth/virtualheight more modernly and
 add option to pad screen out to prevent window resizes

---
 .../Consoles/Sega/gpgx/GPGX.cs                | 32 +++++++++++++++----
 .../Consoles/Sega/gpgx/LibGPGX.cs             |  2 +-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
index 6a5bb42b0a..80094e61fb 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
@@ -755,8 +755,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 		int vwidth;
 		int vheight;
 		public int[] GetVideoBuffer() { return vidbuff; }
-		public int VirtualWidth { get { return BufferWidth; } } // TODO
-		public int VirtualHeight { get { return BufferHeight; } } // TODO
+		public int VirtualWidth { get { return 320; } }
+		public int VirtualHeight { get { return 224; } }
 		public int BufferWidth { get { return vwidth; } }
 		public int BufferHeight { get { return vheight; } }
 		public int BackgroundColor { get { return unchecked((int)0xff000000); } }
@@ -777,24 +777,37 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 
 		unsafe void update_video()
 		{
-			int pitch = 0;
+			int gppitch, gpwidth, gpheight;
 			IntPtr src = IntPtr.Zero;
 
-			LibGPGX.gpgx_get_video(ref vwidth, ref vheight, ref pitch, ref src);
+			LibGPGX.gpgx_get_video(out gpwidth, out gpheight, out gppitch, ref src);
+
+			vwidth = gpwidth;
+			vheight = gpheight;
+
+			if (_Settings.PadScreen320 && vwidth == 256)
+				vwidth = 320;
+
+			int xpad = (vwidth - gpwidth) / 2;
+			int xpad2 = vwidth - gpwidth - xpad;
 
 			if (vidbuff.Length < vwidth * vheight)
 				vidbuff = new int[vwidth * vheight];
 
-			int rinc = (pitch / 4) - vwidth;
+			int rinc = (gppitch / 4) - gpwidth;
 			fixed (int* pdst_ = &vidbuff[0])
 			{
 				int* pdst = pdst_;
 				int* psrc = (int*)src;
 
-				for (int j = 0; j < vheight; j++)
+				for (int j = 0; j < gpheight; j++)
 				{
-					for (int i = 0; i < vwidth; i++)
+					for(int i=0;i<xpad;i++)
+					  *pdst++ = unchecked((int)0xff000000);
+					for (int i = 0; i < gpwidth; i++)
 						*pdst++ = *psrc++;// | unchecked((int)0xff000000);
+					for (int i = 0; i < xpad2; i++)
+					  *pdst++ = unchecked((int)0xff000000);
 					psrc += rinc;
 				}
 			}
@@ -839,6 +852,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 			[DefaultValue(true)]
 			public bool DrawBGW { get; set; }
 
+			[DisplayName("Pad screen to 320")]
+			[Description("Set to True to pads the screen out to be 320 when in 256 wide video modes")]
+			[DefaultValue(false)]
+			public bool PadScreen320 { get; set; }
+
 			public GPGXSettings()
 			{
 				SettingsUtil.SetDefaultValues(this);
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs
index c962d314ef..9aa4980695 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs
@@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 	public static class LibGPGX
 	{
 		[DllImport("libgenplusgx.dll", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void gpgx_get_video(ref int w, ref int h, ref int pitch, ref IntPtr buffer);
+		public static extern void gpgx_get_video(out int w, out int h, out int pitch, ref IntPtr buffer);
 
 		[DllImport("libgenplusgx.dll", CallingConvention = CallingConvention.Cdecl)]
 		public static extern void gpgx_get_audio(ref int n, ref IntPtr buffer);