X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Flibretro.c;h=34316850848f171f6587dcebda8d306d1243bdbe;hp=62129808f6bd1a6a10886d39ceec02d127a220cc;hb=5ca2ec64779fee99d0fc347330a83ae5e982d282;hpb=7df396ea8c8eff6094e999f5c67b5f6b7e599199 diff --git a/frontend/libretro.c b/frontend/libretro.c index 62129808..34316850 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -83,7 +83,7 @@ static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp) { } -#ifdef FRONTEND_SUPPORTS_RGB565 +#ifndef FRONTEND_SUPPORTS_RGB565 static void convert(void *buf, size_t bytes) { unsigned int i, v, *p = buf; @@ -97,6 +97,7 @@ static void convert(void *buf, size_t bytes) 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) { @@ -128,10 +129,11 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h) out: #ifndef FRONTEND_SUPPORTS_RGB565 - convert(vout_buf, w * h * 2); + convert(vout_buf, w * h * 2); #endif - game_width = w; - game_height = h; + game_width = w; + game_height = h; + game_fb_dirty = 1; pl_rearmed_cbs.flip_cnt++; } @@ -279,7 +281,7 @@ 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"); + SysPrintf("RGB565 supported, using it\n"); } #endif @@ -292,7 +294,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; } @@ -300,7 +302,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; } @@ -308,14 +310,14 @@ 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(0); @@ -390,7 +392,9 @@ void retro_run(void) psxCpu->Execute(); samples_to_send += 44100 / 60; - video_cb(vout_buf, game_width, game_height, game_width * 2); + + video_cb(game_fb_dirty ? vout_buf : NULL, game_width, game_height, game_width * 2); + game_fb_dirty = 0; } void retro_init(void) @@ -404,7 +408,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); } @@ -424,15 +428,24 @@ 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); + /* Set how much slower PSX CPU runs * 100 (so that 200 is 2 times) + * we have to do this because cache misses and some IO penalties + * are not emulated. Warning: changing this may break compatibility. */ +#ifdef __ARM_ARCH_7A__ + cycle_multiplier = 175; +#else + cycle_multiplier = 200; +#endif + McdDisable[0] = 0; McdDisable[1] = 1; init_memcard(Mcd1Data);