From f9f60dae01fe8a8262d52950893c2674c4545f4a Mon Sep 17 00:00:00 2001
From: Toad King
Date: Sun, 2 Dec 2012 14:36:18 -0500
Subject: libretro: use SRAM saving routines for memory card.

force only one memory card for libretro
---
 frontend/libretro.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/libretro.c b/frontend/libretro.c
index db13d7a..15041bc 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -32,6 +32,10 @@ static int samples_sent, samples_to_send;
 static int plugins_opened;
 static int native_rgb565;
 
+/* memory card data */
+extern char Mcd1Data[MCD_SIZE];
+extern char McdDisable[2];
+
 /* PCSX ReARMed core calls and stuff */
 int in_type1, in_type2;
 int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
@@ -295,12 +299,12 @@ unsigned retro_get_region(void)
 
 void *retro_get_memory_data(unsigned id)
 {
-	return NULL;
+	return Mcd1Data;
 }
 
 size_t retro_get_memory_size(unsigned id)
 {
-	return 0;
+	return MCD_SIZE;
 }
 
 void retro_reset(void)
@@ -387,6 +391,9 @@ void retro_init(void)
 
 	level = 1;
 	environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
+
+	McdDisable[0] = 0;
+	McdDisable[1] = 1;
 }
 
 void retro_deinit(void)
-- 
cgit v1.2.3


From 46aa5b98890412bca8487b28809df3ece137dba9 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 4 Dec 2012 14:16:34 +0100
Subject: libretro: make RGB565 support into compile-time option

all libretro frontends should support this no matter what
---
 Makefile            |  3 ++-
 frontend/libretro.c | 12 +++++++-----
 jni/Android.mk      |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 0c7854d..2ca2fdd 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ OBJS += plugins/gpu_unai/gpulib_if.o
 ifeq "$(ARCH)" "arm"
 OBJS += plugins/gpu_unai/gpu_arm.o
 endif
-plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3
+plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 
 CC_LINK = $(CXX)
 endif
 
@@ -163,6 +163,7 @@ USE_PLUGIN_LIB = 1
 endif
 ifeq "$(PLATFORM)" "libretro"
 OBJS += frontend/libretro.o
+CFLAGS += -DFRONTEND_SUPPORTS_RGB565
 endif
 
 ifeq "$(USE_PLUGIN_LIB)" "1"
diff --git a/frontend/libretro.c b/frontend/libretro.c
index 15041bc..49e346b 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];
@@ -51,6 +50,7 @@ static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 {
 }
 
+#ifdef FRONTEND_SUPPORTS_RGB565
 static void convert(void *buf, size_t bytes)
 {
 	unsigned int i, v, *p = buf;
@@ -60,6 +60,7 @@ static void convert(void *buf, size_t bytes)
 		p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0);
 	}
 }
+#endif
 
 static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 {
@@ -90,8 +91,9 @@ 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);
+#ifndef FRONTEND_SUPPORTS_RGB565
+   convert(vout_buf, w * h * 2);
+#endif
 	video_cb(vout_buf, w, h, w * 2);
 	pl_rearmed_cbs.flip_cnt++;
 }
@@ -237,11 +239,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();
@@ -402,4 +405,3 @@ void retro_deinit(void)
 	free(vout_buf);
 	vout_buf = NULL;
 }
-
diff --git a/jni/Android.mk b/jni/Android.mk
index 89af335..06b4379 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -89,7 +89,7 @@ LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c
 # libretro
 LOCAL_SRC_FILES += ../frontend/libretro.c
 
-LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND
+LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
 LOCAL_LDLIBS := -lz -llog
 
-- 
cgit v1.2.3


From bcbe4aa4b45d8d37a6a3f1d80b4da1f3beb2be16 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 4 Dec 2012 14:36:01 +0100
Subject: libretro: call video_cb on every frame

We need to do video_cb in retro_run every frame instead of
just once every time the video callback is called - otherwise
we will get very bad/skippy framerates.
Performance is much improved now in nearly all games.
---
 frontend/libretro.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 49e346b..e505804 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -62,6 +62,9 @@ static void convert(void *buf, size_t bytes)
 }
 #endif
 
+static unsigned game_width;
+static unsigned game_height;
+
 static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 {
 	unsigned short *dest = vout_buf;
@@ -94,8 +97,8 @@ out:
 #ifndef FRONTEND_SUPPORTS_RGB565
    convert(vout_buf, w * h * 2);
 #endif
-	video_cb(vout_buf, w, h, w * 2);
-	pl_rearmed_cbs.flip_cnt++;
+   game_width = w;
+   game_height = h;
 }
 
 static void vout_close(void)
@@ -353,6 +356,8 @@ void retro_run(void)
 	psxCpu->Execute();
 
 	samples_to_send += 44100 / 60;
+	video_cb(vout_buf, game_width, game_height, game_width * 2);
+	pl_rearmed_cbs.flip_cnt++;
 }
 
 void retro_init(void)
-- 
cgit v1.2.3


From 2ee53c487bfaa112fec8f740ae05717a79994264 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 4 Dec 2012 16:38:01 +0100
Subject: libretro: Move flip screen counter increment back to end of flip
 screen callback

---
 frontend/libretro.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/libretro.c b/frontend/libretro.c
index e505804..180c1d7 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -99,6 +99,7 @@ out:
 #endif
    game_width = w;
    game_height = h;
+	pl_rearmed_cbs.flip_cnt++;
 }
 
 static void vout_close(void)
@@ -357,7 +358,6 @@ void retro_run(void)
 
 	samples_to_send += 44100 / 60;
 	video_cb(vout_buf, game_width, game_height, game_width * 2);
-	pl_rearmed_cbs.flip_cnt++;
 }
 
 void retro_init(void)
-- 
cgit v1.2.3


From 7df396ea8c8eff6094e999f5c67b5f6b7e599199 Mon Sep 17 00:00:00 2001
From: Toad King
Date: Tue, 4 Dec 2012 19:26:09 -0500
Subject: libretro: initialize blank memory card

---
 frontend/libretro.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 180c1d7..6212980 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -41,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;
@@ -402,6 +435,7 @@ void retro_init(void)
 
 	McdDisable[0] = 0;
 	McdDisable[1] = 1;
+	init_memcard(Mcd1Data);
 }
 
 void retro_deinit(void)
-- 
cgit v1.2.3


From 460f4c37a6fa4fbebba78fb82d153213442e2336 Mon Sep 17 00:00:00 2001
From: Toad King
Date: Tue, 4 Dec 2012 19:26:23 -0500
Subject: update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e6fc06b..2500270 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ config.log
 frontend/revision.h
 tools
 .pcsx/
+obj/
-- 
cgit v1.2.3


From e2bdb933ecee40a0c4caf14a20f5e642e3b93120 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 10 Dec 2012 03:38:46 +0200
Subject: libretro: only pass fb to video_cb when it's updated

---
 frontend/libretro.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 6212980..8256fe1 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -97,6 +97,7 @@ static void convert(void *buf, size_t bytes)
 
 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)
 {
@@ -132,7 +133,8 @@ out:
 #endif
    game_width = w;
    game_height = h;
-	pl_rearmed_cbs.flip_cnt++;
+   game_fb_dirty = 1;
+   pl_rearmed_cbs.flip_cnt++;
 }
 
 static void vout_close(void)
@@ -390,7 +392,9 @@ void retro_run(void)
 	psxCpu->Execute();
 
 	samples_to_send += 44100 / 60;
-	video_cb(vout_buf, game_width, game_height, game_width * 2);
+
+	video_cb(game_fb_dirty ? vout_buf : NULL, game_width, game_height, game_width * 2);
+	game_fb_dirty = 0;
 }
 
 void retro_init(void)
-- 
cgit v1.2.3


From cc4f9b703ba166301a31ef6c695e1d02572e6bc4 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 10 Dec 2012 18:42:13 +0200
Subject: libretro: minor cleanups

---
 frontend/libretro.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 8256fe1..bdcf519 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -83,7 +83,7 @@ static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 {
 }
 
-#ifdef FRONTEND_SUPPORTS_RGB565
+#ifndef FRONTEND_SUPPORTS_RGB565
 static void convert(void *buf, size_t bytes)
 {
 	unsigned int i, v, *p = buf;
@@ -129,12 +129,12 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 
 out:
 #ifndef FRONTEND_SUPPORTS_RGB565
-   convert(vout_buf, w * h * 2);
+	convert(vout_buf, w * h * 2);
 #endif
-   game_width = w;
-   game_height = h;
-   game_fb_dirty = 1;
-   pl_rearmed_cbs.flip_cnt++;
+	game_width = w;
+	game_height = h;
+	game_fb_dirty = 1;
+	pl_rearmed_cbs.flip_cnt++;
 }
 
 static void vout_close(void)
-- 
cgit v1.2.3