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

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 29276bda..ad209b33 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -12,6 +12,7 @@
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/psxcounters.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
+#include "../plugins/dfsound/out.h"
 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"
@@ -28,6 +29,7 @@ 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;
 
 /* PCSX ReARMed core calls and stuff */
 int in_type1, in_type2;
@@ -48,11 +50,11 @@ 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 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);
 	}
@@ -61,7 +63,8 @@ static void convert(void *buf, size_t size)
 static void *vout_flip(void)
 {
 	pl_rearmed_cbs.flip_cnt++;
-	convert(vout_buf,  vout_width * vout_height * 2);
+	if (!native_rgb565)
+		convert(vout_buf,  vout_width * vout_height * 2);
 	video_cb(vout_buf, vout_width, vout_height, vout_width * 2);
 
 	return vout_buf;
@@ -100,15 +103,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 +120,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; }
@@ -186,6 +199,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;