gpgx: sprite layer toggle

BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.ISettable.cs

@@ -66,6 +66,15 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 			[DefaultValue(true)]
 			public bool DrawBGW { get { return _DrawBGW; } set { _DrawBGW = value; } }
 
+			[DeepEqualsIgnore]
+			[JsonIgnore]
+			private bool _DrawObj;
+
+			[DisplayName("Sprite Layer")]
+			[Description("True to draw sprite layer")]
+			[DefaultValue(true)]
+			public bool DrawObj { get { return _DrawObj; } set { _DrawObj = value; } }
+
 			[DeepEqualsIgnore]
 			[JsonIgnore]
 			private bool _PadScreen320;
@@ -125,6 +134,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 				if (DrawBGA) ret |= LibGPGX.DrawMask.BGA;
 				if (DrawBGB) ret |= LibGPGX.DrawMask.BGB;
 				if (DrawBGW) ret |= LibGPGX.DrawMask.BGW;
+				if (DrawObj) ret |= LibGPGX.DrawMask.Obj;
 				return ret;
 			}
 

BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs

@@ -333,7 +333,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 		{
 			BGA = 1,
 			BGB = 2,
-			BGW = 4
+			BGW = 4,
+			Obj = 8
 		}
 
 		[DllImport("libgenplusgx.dll", CallingConvention = CallingConvention.Cdecl)]

genplus-gx/cinterface/cinterface.c

@@ -37,6 +37,7 @@ static int nsamples;
 int cinterface_render_bga = 1;
 int cinterface_render_bgb = 1;
 int cinterface_render_bgw = 1;
+int cinterface_render_obj = 0;
 
 #define GPGX_EX __declspec(dllexport)
 
@@ -598,6 +599,7 @@ GPGX_EX void gpgx_set_draw_mask(int mask)
 	cinterface_render_bga = !!(mask & 1);
 	cinterface_render_bgb = !!(mask & 2);
 	cinterface_render_bgw = !!(mask & 4);
+	cinterface_render_obj = !!(mask & 8);
 }
 
 typedef struct

genplus-gx/core/vdp_render.c

@@ -47,6 +47,7 @@
 extern int cinterface_render_bga;
 extern int cinterface_render_bgb;
 extern int cinterface_render_bgw;
+extern int cinterface_render_obj;
 
 /*** NTSC Filters ***/
 extern md_ntsc_t *md_ntsc;
@@ -415,6 +416,7 @@ INLINE void WRITE_LONG(void *address, uint32 data)
 #endif /* ALT_RENDERER */
 
 #define DRAW_SPRITE_TILE(WIDTH,ATTR,TABLE)  \
+  if (!cinterface_render_obj) return; \
   for (i=0;i<WIDTH;i++) \
   { \
     temp = *src++; \
@@ -427,6 +429,7 @@ INLINE void WRITE_LONG(void *address, uint32 data)
   }
 
 #define DRAW_SPRITE_TILE_ACCURATE(WIDTH,ATTR,TABLE)  \
+  if (!cinterface_render_obj) return; \
   for (i=0;i<WIDTH;i++) \
   { \
     temp = *src++; \
@@ -1534,30 +1537,30 @@ void render_bg_m5(int line)
   uint32 *nt;
   if (cinterface_render_bgb)
   {
-  nt = (uint32 *)&vram[ntbb + (((v_line >> 3) << pf_shift) & 0x1FC0)];
-
-  /* Pattern row index */
-  v_line = (v_line & 7) << 3;
-
-  if(shift)
-  {
-    /* Plane B line buffer */
-    dst = (uint32 *)&linebuf[0][0x10 + shift];
-
-    atbuf = nt[(index - 1) & pf_col_mask];
-    DRAW_COLUMN(atbuf, v_line)
-  }
-  else
-  {
-    /* Plane B line buffer */
-    dst = (uint32 *)&linebuf[0][0x20];
-  }
-
-  for(column = 0; column < end; column++, index++)
-  {
-    atbuf = nt[index & pf_col_mask];
-    DRAW_COLUMN(atbuf, v_line)
-  }
+    nt = (uint32 *)&vram[ntbb + (((v_line >> 3) << pf_shift) & 0x1FC0)];
+    
+    /* Pattern row index */
+    v_line = (v_line & 7) << 3;
+    
+    if(shift)
+    {
+      /* Plane B line buffer */
+      dst = (uint32 *)&linebuf[0][0x10 + shift];
+    
+      atbuf = nt[(index - 1) & pf_col_mask];
+      DRAW_COLUMN(atbuf, v_line)
+    }
+    else
+    {
+      /* Plane B line buffer */
+      dst = (uint32 *)&linebuf[0][0x20];
+    }
+    
+    for(column = 0; column < end; column++, index++)
+    {
+      atbuf = nt[index & pf_col_mask];
+      DRAW_COLUMN(atbuf, v_line)
+    }
   }
   else
   {