libretro: only pass fb to video_cb when it's updated

[pcsx_rearmed.git] / frontend / libretro.c

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 29276bd..8256fe1 100644 (file)
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -11,7 +11,10 @@
 
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/psxcounters.h"
 
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/psxcounters.h"

+#include "../libpcsxcore/psxmem_map.h"

 #include "../libpcsxcore/new_dynarec/new_dynarec.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"
 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"


@@ -25,57 +28,136 @@ static retro_environment_t environ_cb;
 static retro_audio_sample_batch_t audio_batch_cb;
 
 static void *vout_buf;
 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 samples_sent, samples_to_send;
 static int plugins_opened;
 

+/* 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 };
 int in_keystate;
 int in_enable_vibration;
 
 /* PCSX ReARMed core calls and stuff */
 int in_type1, in_type2;
 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;
 }
 
 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 size)
+#ifdef FRONTEND_SUPPORTS_RGB565
+static void convert(void *buf, size_t bytes)

 {
        unsigned int i, v, *p = buf;
 
 {
        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);
        }
 }
                v = p[i];
                p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0);
        }
 }

+#endif

 
 

-static void *vout_flip(void)
+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)

 {
 {

-       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(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:
+#ifndef FRONTEND_SUPPORTS_RGB565
+   convert(vout_buf, w * h * 2);
+#endif
+   game_width = w;
+   game_height = h;
+   game_fb_dirty = 1;
+   pl_rearmed_cbs.flip_cnt++;

 }
 
 static void vout_close(void)
 {
 }
 
 }
 
 static void vout_close(void)
 {
 }
 

+static void *pl_mmap(unsigned int size)
+{
+       return psxMap(0, size, 0, MAP_TAG_VRAM);
+}
+
+static void pl_munmap(void *ptr, unsigned int size)
+{
+       psxUnmap(ptr, size, MAP_TAG_VRAM);
+}
+

 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,
 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,
        /* from psxcounters */
        .gpu_hcnt = &hSyncCount,
        .gpu_frame_count = &frame_counter,


@@ -95,20 +177,21 @@ 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)

 {
 }
 
 /* sound calls */
 {
 }
 
 /* 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 */
 {
        if (samples_to_send > samples_sent)
                return 0; /* give more samples */


@@ -116,12 +199,21 @@ unsigned long SoundGetBytesBuffered(void)
                return 1;
 }
 
                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;
 }
 
 {
        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; }
 /* 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 +278,13 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
 
 bool retro_load_game(const struct retro_game_info *info)
 {
 
 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)) {
+               fprintf(stderr, "RGB565 supported, using it\n");
+       }
+#endif
+

        if (plugins_opened) {
                ClosePlugins();
                plugins_opened = 0;
        if (plugins_opened) {
                ClosePlugins();
                plugins_opened = 0;


@@ -221,7 +320,7 @@ bool retro_load_game(const struct retro_game_info *info)
                printf("could not load CD-ROM!\n");
                return false;
        }
                printf("could not load CD-ROM!\n");
                return false;
        }

-       emu_on_new_cd();
+       emu_on_new_cd(0);

 
        return true;
 }
 
        return true;
 }


@@ -242,12 +341,12 @@ unsigned retro_get_region(void)
 
 void *retro_get_memory_data(unsigned id)
 {
 
 void *retro_get_memory_data(unsigned id)
 {

-       return NULL;
+       return Mcd1Data;

 }
 
 size_t retro_get_memory_size(unsigned id)
 {
 }
 
 size_t retro_get_memory_size(unsigned id)
 {

-       return 0;
+       return MCD_SIZE;

 }
 
 void retro_reset(void)
 }
 
 void retro_reset(void)


@@ -293,6 +392,9 @@ void retro_run(void)
        psxCpu->Execute();
 
        samples_to_send += 44100 / 60;
        psxCpu->Execute();
 
        samples_to_send += 44100 / 60;

+
+       video_cb(game_fb_dirty ? vout_buf : NULL, game_width, game_height, game_width * 2);
+       game_fb_dirty = 0;

 }
 
 void retro_init(void)
 }
 
 void retro_init(void)


@@ -334,6 +436,10 @@ void retro_init(void)
 
        level = 1;
        environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
 
        level = 1;
        environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);

+
+       McdDisable[0] = 0;
+       McdDisable[1] = 1;
+       init_memcard(Mcd1Data);

 }
 
 void retro_deinit(void)
 }
 
 void retro_deinit(void)


@@ -342,4 +448,3 @@ void retro_deinit(void)
        free(vout_buf);
        vout_buf = NULL;
 }
        free(vout_buf);
        vout_buf = NULL;
 }

-