Merge branch 'enhancement'

[pcsx_rearmed.git] / frontend / libretro.c

diff --git a/frontend/libretro.c b/frontend/libretro.c
index d1cb400..1eb2147 100644 (file)
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -29,6 +29,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 +46,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;
@@ -84,9 +84,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++;
 }
@@ -220,6 +220,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;