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

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 29276bda..d1cb4006 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -12,6 +12,8 @@
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/psxcounters.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
+#include "../plugins/dfsound/out.h"
+#include "../plugins/gpulib/cspace.h"
 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"
@@ -25,7 +27,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;
 
@@ -40,31 +41,54 @@ 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 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 size)
+static void convert(void *buf, size_t bytes)
 {
 	unsigned int i, v, *p = buf;
 
-	for (i = 0; i < size / 2; i++) {
+	for (i = 0; i < bytes / 4; i++) {
 		v = p[i];
 		p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0);
 	}
 }
 
-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++;
-	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(pl_vout_buf, 0, dstride * h * 2);
+		goto out;
+	}
+
+	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);
+		}
+	}
 
-	return vout_buf;
+
+out:
+	convert(vout_buf, w * h * 2);
+	video_cb(vout_buf, w, h, w * 2);
+	pl_rearmed_cbs.flip_cnt++;
 }
 
 static void vout_close(void)
@@ -100,15 +124,16 @@ void pl_update_gun(int *xn, int *xres, int *y, int *in)
 }
 
 /* sound calls */
-void SetupSound(void)
+static int snd_init(void)
 {
+	return 0;
 }
 
-void RemoveSound(void)
+static void snd_finish(void)
 {
 }
 
-unsigned long SoundGetBytesBuffered(void)
+static int snd_busy(void)
 {
 	if (samples_to_send > samples_sent)
 		return 0; /* give more samples */
@@ -116,12 +141,21 @@ unsigned long SoundGetBytesBuffered(void)
 		return 1;
 }
 
-void SoundFeedStreamData(void *buf, long bytes)
+static void snd_feed(void *buf, int bytes)
 {
 	audio_batch_cb(buf, bytes / 4);
 	samples_sent += bytes / 4;
 }
 
+void out_register_libretro(struct out_driver *drv)
+{
+	drv->name = "libretro";
+	drv->init = snd_init;
+	drv->finish = snd_finish;
+	drv->busy = snd_busy;
+	drv->feed = snd_feed;
+}
+
 /* libretro */
 void retro_set_environment(retro_environment_t cb) { environ_cb = cb; }
 void retro_set_video_refresh(retro_video_refresh_t cb) { video_cb = cb; }