X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Flibretro.c;h=0eef05932086d075c7c8cd7e021c583554acb21b;hp=29276bda095e615aeebb0adb4c77002d57caad6b;hb=f29fbd5358e28135d389e2218da7c90f8b94b983;hpb=38c2028e228dcf17f3b4b0ac7e6984d1e1c6df79 diff --git a/frontend/libretro.c b/frontend/libretro.c index 29276bda..0eef0593 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -11,7 +11,10 @@ #include "../libpcsxcore/misc.h" #include "../libpcsxcore/psxcounters.h" +#include "../libpcsxcore/psxmem_map.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,9 +28,9 @@ 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; /* PCSX ReARMed core calls and stuff */ int in_type1, in_type2; @@ -40,42 +43,76 @@ 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) +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(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: + 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 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, + .mmap = pl_mmap, + .munmap = pl_munmap, /* from psxcounters */ .gpu_hcnt = &hSyncCount, .gpu_frame_count = &frame_counter, @@ -95,20 +132,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 */ -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 +154,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 +233,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; + SysPrintf("RGB565 supported, using it\n"); + } + if (plugins_opened) { ClosePlugins(); plugins_opened = 0; @@ -195,7 +248,7 @@ bool retro_load_game(const struct retro_game_info *info) /* have to reload after set_cd_image for correct cdr plugin */ if (LoadPlugins() == -1) { - printf("faled to load plugins\n"); + SysPrintf("failed to load plugins\n"); return false; } @@ -203,7 +256,7 @@ bool retro_load_game(const struct retro_game_info *info) NetOpened = 0; if (OpenPlugins() == -1) { - printf("faled to open plugins\n"); + SysPrintf("failed to open plugins\n"); return false; } @@ -211,17 +264,17 @@ bool retro_load_game(const struct retro_game_info *info) Config.PsxAuto = 1; if (CheckCdrom() == -1) { - printf("unsupported/invalid CD image: %s\n", info->path); + SysPrintf("unsupported/invalid CD image: %s\n", info->path); return false; } SysReset(); if (LoadCdrom() == -1) { - printf("could not load CD-ROM!\n"); + SysPrintf("could not load CD-ROM!\n"); return false; } - emu_on_new_cd(); + emu_on_new_cd(0); return true; } @@ -306,7 +359,7 @@ void retro_init(void) ret = emu_core_preinit(); ret |= emu_core_init(); if (ret != 0) { - printf("PCSX init failed, sorry\n"); + SysPrintf("PCSX init failed.\n"); exit(1); } @@ -326,11 +379,11 @@ void retro_init(void) } } if (f != NULL) { - printf("found BIOS file: %s\n", Config.Bios); + SysPrintf("found BIOS file: %s\n", Config.Bios); fclose(f); } else - printf("no BIOS files found.\n"); + SysPrintf("no BIOS files found.\n"); level = 1; environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);