X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Flibretro.c;h=bdcf519bf3e57cd6ecdd3f170865a1d8c5e6b007;hp=15041bc365d7f175d62f568b8c405ffd86f84c23;hb=cc4f9b703ba166301a31ef6c695e1d02572e6bc4;hpb=f9f60dae01fe8a8262d52950893c2674c4545f4a

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 15041bc3..bdcf519b 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -30,7 +30,6 @@ static retro_audio_sample_batch_t audio_batch_cb;
 static void *vout_buf;
 static int samples_sent, samples_to_send;
 static int plugins_opened;
-static int native_rgb565;
 
 /* memory card data */
 extern char Mcd1Data[MCD_SIZE];
@@ -42,6 +41,39 @@ int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
 int in_keystate;
 int in_enable_vibration;
 
+static void init_memcard(char *mcd_data)
+{
+	unsigned off = 0;
+	unsigned i;
+
+	memset(mcd_data, 0, MCD_SIZE);
+
+	mcd_data[off++] = 'M';
+	mcd_data[off++] = 'C';
+	off += 0x7d;
+	mcd_data[off++] = 0x0e;
+
+	for (i = 0; i < 15; i++) {
+		mcd_data[off++] = 0xa0;
+		off += 0x07;
+		mcd_data[off++] = 0xff;
+		mcd_data[off++] = 0xff;
+		off += 0x75;
+		mcd_data[off++] = 0xa0;
+	}
+
+	for (i = 0; i < 20; i++) {
+		mcd_data[off++] = 0xff;
+		mcd_data[off++] = 0xff;
+		mcd_data[off++] = 0xff;
+		mcd_data[off++] = 0xff;
+		off += 0x04;
+		mcd_data[off++] = 0xff;
+		mcd_data[off++] = 0xff;
+		off += 0x76;
+	}
+}
+
 static int vout_open(void)
 {
 	return 0;
@@ -51,6 +83,7 @@ static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 {
 }
 
+#ifndef FRONTEND_SUPPORTS_RGB565
 static void convert(void *buf, size_t bytes)
 {
 	unsigned int i, v, *p = buf;
@@ -60,6 +93,11 @@ static void convert(void *buf, size_t bytes)
 		p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0);
 	}
 }
+#endif
+
+static unsigned game_width;
+static unsigned game_height;
+static unsigned game_fb_dirty;
 
 static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 {
@@ -90,9 +128,12 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 	}
 
 out:
-	if (!native_rgb565)
-		convert(vout_buf, w * h * 2);
-	video_cb(vout_buf, w, h, w * 2);
+#ifndef FRONTEND_SUPPORTS_RGB565
+	convert(vout_buf, w * h * 2);
+#endif
+	game_width = w;
+	game_height = h;
+	game_fb_dirty = 1;
 	pl_rearmed_cbs.flip_cnt++;
 }
 
@@ -237,11 +278,12 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
 
 bool retro_load_game(const struct retro_game_info *info)
 {
+#ifdef FRONTEND_SUPPORTS_RGB565
 	enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
 	if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) {
-		native_rgb565 = 1;
 		fprintf(stderr, "RGB565 supported, using it\n");
 	}
+#endif
 
 	if (plugins_opened) {
 		ClosePlugins();
@@ -350,6 +392,9 @@ void retro_run(void)
 	psxCpu->Execute();
 
 	samples_to_send += 44100 / 60;
+
+	video_cb(game_fb_dirty ? vout_buf : NULL, game_width, game_height, game_width * 2);
+	game_fb_dirty = 0;
 }
 
 void retro_init(void)
@@ -394,6 +439,7 @@ void retro_init(void)
 
 	McdDisable[0] = 0;
 	McdDisable[1] = 1;
+	init_memcard(Mcd1Data);
 }
 
 void retro_deinit(void)
@@ -402,4 +448,3 @@ void retro_deinit(void)
 	free(vout_buf);
 	vout_buf = NULL;
 }
-