Merge git://github.com/notaz/pcsx_rearmed

1 files changed, 48 insertions, 14 deletions

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 4305aa7..b832a4e 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -13,6 +13,8 @@
 #include "../libpcsxcore/psxcounters.h"
 #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"
@@ -26,7 +28,6 @@ static retro_environment_t environ_cb;
 static retro_audio_sample_batch_t audio_batch_cb;
 
 static void *vout_buf;
-static int vout_width, vout_height;
 static int samples_sent, samples_to_send;
 static int plugins_opened;
 static int native_rgb565;
@@ -42,14 +43,10 @@ static int vout_open(void)
 	return 0;
 }
 
-static void *vout_set_mode(int w, int h, int bpp)
+static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 {
-	vout_width = w;
-	vout_height = h;
-	return vout_buf;
 }
 
-/* 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;
@@ -60,25 +57,62 @@ static void convert(void *buf, size_t bytes)
 	}
 }
 
-static void *vout_flip(void)
+static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 {
-	pl_rearmed_cbs.flip_cnt++;
-	if (!native_rgb565)
-		convert(vout_buf,  vout_width * vout_height * 2);
-	video_cb(vout_buf, vout_width, vout_height, vout_width * 2);
+	unsigned short *dest = vout_buf;
+	const unsigned short *src = vram;
+	int dstride = w, h1 = h;
+
+	if (vram == NULL) {
+		// blanking
+		memset(vout_buf, 0, dstride * h * 2);
+		goto out;
+	}
 
-	return vout_buf;
+	if (bgr24)
+	{
+		// XXX: could we switch to RETRO_PIXEL_FORMAT_XRGB8888 here?
+		for (; h1-- > 0; dest += dstride, src += stride)
+		{
+			bgr888_to_rgb565(dest, src, w * 3);
+		}
+	}
+	else
+	{
+		for (; h1-- > 0; dest += dstride, src += stride)
+		{
+			bgr555_to_rgb565(dest, src, w * 2);
+		}
+	}
+
+out:
+	if (!native_rgb565)
+		convert(vout_buf, w * h * 2);
+	video_cb(vout_buf, w, h, w * 2);
+	pl_rearmed_cbs.flip_cnt++;
 }
 
 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,
@@ -98,7 +132,7 @@ void plat_trigger_vibrate(int is_strong)
 {
 }
 
-void pl_update_gun(int *xn, int *xres, int *y, int *in)
+void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in)
 {
 }
 
@@ -240,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;
 }