X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Flibretro.c;h=82e6f658d9eaa8d5cdd590308fdcb1b21ed42ce2;hp=d1cb4006e88edb48e8894f9cef9526680aab8ba5;hb=79f216e32563acc81517729fe56a6f11f110b0a4;hpb=fa56d36096cd4ab2b227ce2aa61c8404b8874689

diff --git a/frontend/libretro.c b/frontend/libretro.c
index d1cb4006..82e6f658 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -14,6 +14,7 @@
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfsound/out.h"
 #include "../plugins/gpulib/cspace.h"
+#include "linux/plat_mmap.h"
 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"
@@ -29,6 +30,7 @@ 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;
 
 /* PCSX ReARMed core calls and stuff */
 int in_type1, in_type2;
@@ -45,7 +47,6 @@ static void vout_set_mode(int w, int h, int bpp)
 {
 }
 
-/* FIXME: either teach PCSX to blit to RGB1555 or RetroArch to support RGB565 */
 static void convert(void *buf, size_t bytes)
 {
 	unsigned int i, v, *p = buf;
@@ -64,7 +65,7 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 
 	if (vram == NULL) {
 		// blanking
-		memset(pl_vout_buf, 0, dstride * h * 2);
+		memset(vout_buf, 0, dstride * h * 2);
 		goto out;
 	}
 
@@ -84,9 +85,9 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 		}
 	}
 
-
 out:
-	convert(vout_buf, w * h * 2);
+	if (!native_rgb565)
+		convert(vout_buf, w * h * 2);
 	video_cb(vout_buf, w, h, w * 2);
 	pl_rearmed_cbs.flip_cnt++;
 }
@@ -95,11 +96,23 @@ static void vout_close(void)
 {
 }
 
+static void *pl_mmap(unsigned int size)
+{
+	return plat_mmap(0, size, 0, 0);
+}
+
+static void pl_munmap(void *ptr, unsigned int size)
+{
+	plat_munmap(ptr, size);
+}
+
 struct rearmed_cbs pl_rearmed_cbs = {
 	.pl_vout_open = vout_open,
 	.pl_vout_set_mode = vout_set_mode,
 	.pl_vout_flip = vout_flip,
 	.pl_vout_close = vout_close,
+	.mmap = pl_mmap,
+	.munmap = pl_munmap,
 	/* from psxcounters */
 	.gpu_hcnt = &hSyncCount,
 	.gpu_frame_count = &frame_counter,
@@ -220,6 +233,12 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
 
 bool retro_load_game(const struct retro_game_info *info)
 {
+	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");
+	}
+
 	if (plugins_opened) {
 		ClosePlugins();
 		plugins_opened = 0;
@@ -255,7 +274,7 @@ bool retro_load_game(const struct retro_game_info *info)
 		printf("could not load CD-ROM!\n");
 		return false;
 	}
-	emu_on_new_cd();
+	emu_on_new_cd(0);
 
 	return true;
 }