X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Femu.c;h=c0bc71f4e880159f0f63a4852a66df82e298be9a;hb=98a27142346e05a4cef4fe89469bc09d5560edc1;hp=74bcbcb3ed037e6e3069b6a236741ba75349a9b0;hpb=31f944ea8ceee82ec8b1451aa86b8d4a9d07367e;p=picodrive.git

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 74bcbcb..c0bc71f 100644
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -7,8 +7,8 @@
  * - 8bpp tile renderer
  * In 32x mode:
  * - 32x layer is overlayed on top of 16bpp one
- * - line internal one done on PicoDraw2FB, then mixed with 32x
- * - tile internal one done on PicoDraw2FB, then mixed with 32x
+ * - line internal one done on .Draw2FB, then mixed with 32x
+ * - tile internal one done on .Draw2FB, then mixed with 32x
  */
 
 #include <stdio.h>
@@ -30,7 +30,7 @@
 #include <pico/pico_int.h>
 #include <pico/patch.h>
 #include <pico/sound/mix.h>
-#include <zlib/zlib.h>
+#include <zlib.h>
 
 #ifdef BENCHMARK
 #define OSD_FPS_X 220
@@ -128,21 +128,6 @@ static void osd_text8(int x, int y, const char *text)
 	emu_text_out8(x, y, text);
 }
 
-static void osd_text16(int x, int y, const char *text)
-{
-	int len = strlen(text)*8;
-	int *p, i, h, offs;
-
-	len = (len+1) >> 1;
-	for (h = 0; h < 8; h++) {
-		offs = (x + g_screen_width * (y+h)) & ~1;
-		p = (int *) ((short *)g_screen_ptr + offs);
-		for (i = len; i; i--, p++)
-			*p = (*p >> 2) & 0x39e7;
-	}
-	emu_text_out16(x, y, text);
-}
-
 static void osd_text8_rot(int x, int y, const char *text)
 {
 	int len = strlen(text) * 8;
@@ -237,7 +222,7 @@ static unsigned char __attribute__((aligned(4))) rot_buff[320*4*2];
 
 static int EmuScanBegin16_rot(unsigned int num)
 {
-	DrawLineDest = rot_buff + (num & 3) * 320 * 2;
+	Pico.est.DrawLineDest = rot_buff + (num & 3) * 320 * 2;
 	return 0;
 }
 
@@ -252,7 +237,7 @@ static int EmuScanEnd16_rot(unsigned int num)
 
 static int EmuScanBegin8_rot(unsigned int num)
 {
-	DrawLineDest = rot_buff + (num & 3) * 320;
+	Pico.est.DrawLineDest = rot_buff + (num & 3) * 320;
 	return 0;
 }
 
@@ -277,14 +262,14 @@ static int EmuScanBegin16_ld(unsigned int num)
 	if (emu_scan_begin)
 		return emu_scan_begin(ld_counter);
 	else
-		DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8;
+		Pico.est.DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8;
 
 	return 0;
 }
 
 static int EmuScanEnd16_ld(unsigned int num)
 {
-	void *oldline = DrawLineDest;
+	void *oldline = Pico.est.DrawLineDest;
 
 	if (emu_scan_end)
 		emu_scan_end(ld_counter);
@@ -295,7 +280,7 @@ static int EmuScanEnd16_ld(unsigned int num)
 		ld_left = ld_lines;
 
 		EmuScanBegin16_ld(num);
-		memcpy32(DrawLineDest, oldline, 320 * gp2x_current_bpp / 8 / 4);
+		memcpy32(Pico.est.DrawLineDest, oldline, 320 * gp2x_current_bpp / 8 / 4);
 		if (emu_scan_end)
 			emu_scan_end(ld_counter);
 
@@ -325,9 +310,9 @@ static int make_local_pal_md(int fast_mode)
 		localPal[0xf0] = 0x00ffffff;
 		pallen = 0x100;
 	}
-	else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes
-		bgr444_to_rgb32(localPal+0x40, HighPal);
-		bgr444_to_rgb32(localPal+0x80, HighPal+0x40);
+	else if (Pico.est.rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes
+		bgr444_to_rgb32(localPal+0x40, Pico.est.HighPal);
+		bgr444_to_rgb32(localPal+0x80, Pico.est.HighPal+0x40);
 	}
 	else
 		memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess
@@ -370,9 +355,9 @@ void pemu_finalize_frame(const char *fps, const char *notice)
 		}
 		// a hack for VR
 		if (PicoAHW & PAHW_SVP)
-			memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
+			memset32((int *)(Pico.est.Draw2FB+328*8+328*223), 0xe0e0e0e0, 328);
 		// do actual copy
-		vidcpyM2(g_screen_ptr, PicoDraw2FB+328*8,
+		vidcpyM2(g_screen_ptr, Pico.est.Draw2FB+328*8,
 			!(Pico.video.reg[12] & 1), !(PicoOpt & POPT_DIS_32C_BORDER));
 	}
 	else if (get_renderer() == RT_8BIT_ACC)
@@ -540,7 +525,7 @@ static void vid_reset_mode(void)
 	PicoDrawSetCallbacks(emu_scan_begin, emu_scan_end);
 
 	if (is_16bit_mode())
-		osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;
+		osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : emu_osd_text16;
 	else
 		osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;