notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libretro: handle borders
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
bdcf519
..
3b366d4
100644
(file)
--- a/
frontend/libretro.c
+++ b/
frontend/libretro.c
@@
-28,6
+28,9
@@
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 vout_doffs_old, vout_fb_dirty;
+
static int samples_sent, samples_to_send;
static int plugins_opened;
static int samples_sent, samples_to_send;
static int plugins_opened;
@@
-81,6
+84,8
@@
static int vout_open(void)
static void vout_set_mode(int w, int h, int raw_w, int raw_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;
}
#ifndef FRONTEND_SUPPORTS_RGB565
}
#ifndef FRONTEND_SUPPORTS_RGB565
@@
-95,15
+100,12
@@
static void convert(void *buf, size_t bytes)
}
#endif
}
#endif
-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)
{
unsigned short *dest = vout_buf;
const unsigned short *src = vram;
static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
{
unsigned short *dest = vout_buf;
const unsigned short *src = vram;
- int dstride = w, h1 = h;
+ int dstride = vout_width, h1 = h;
+ int doffs;
if (vram == NULL) {
// blanking
if (vram == NULL) {
// blanking
@@
-111,6
+113,15
@@
static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
goto out;
}
goto out;
}
+ doffs = (vout_height - h) * dstride;
+ doffs += (dstride - w) / 2 & ~1;
+ if (doffs != vout_doffs_old) {
+ // clear borders
+ memset(vout_buf, 0, dstride * h * 2);
+ vout_doffs_old = doffs;
+ }
+ dest += doffs;
+
if (bgr24)
{
// XXX: could we switch to RETRO_PIXEL_FORMAT_XRGB8888 here?
if (bgr24)
{
// XXX: could we switch to RETRO_PIXEL_FORMAT_XRGB8888 here?
@@
-129,11
+140,9
@@
static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
out:
#ifndef FRONTEND_SUPPORTS_RGB565
out:
#ifndef FRONTEND_SUPPORTS_RGB565
- convert(vout_buf,
w * h
* 2);
+ convert(vout_buf,
vout_width * vout_height
* 2);
#endif
#endif
- game_width = w;
- game_height = h;
- game_fb_dirty = 1;
+ vout_fb_dirty = 1;
pl_rearmed_cbs.flip_cnt++;
}
pl_rearmed_cbs.flip_cnt++;
}
@@
-281,7
+290,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)) {
#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
}
#endif
@@
-294,7
+303,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) {
/* have to reload after set_cd_image for correct cdr plugin */
if (LoadPlugins() == -1) {
-
printf("fa
led to load plugins\n");
+
SysPrintf("fai
led to load plugins\n");
return false;
}
return false;
}
@@
-302,7
+311,7
@@
bool retro_load_game(const struct retro_game_info *info)
NetOpened = 0;
if (OpenPlugins() == -1) {
NetOpened = 0;
if (OpenPlugins() == -1) {
-
printf("fa
led to open plugins\n");
+
SysPrintf("fai
led to open plugins\n");
return false;
}
return false;
}
@@
-310,14
+319,14
@@
bool retro_load_game(const struct retro_game_info *info)
Config.PsxAuto = 1;
if (CheckCdrom() == -1) {
Config.PsxAuto = 1;
if (CheckCdrom() == -1) {
-
p
rintf("unsupported/invalid CD image: %s\n", info->path);
+
SysP
rintf("unsupported/invalid CD image: %s\n", info->path);
return false;
}
SysReset();
if (LoadCdrom() == -1) {
return false;
}
SysReset();
if (LoadCdrom() == -1) {
-
p
rintf("could not load CD-ROM!\n");
+
SysP
rintf("could not load CD-ROM!\n");
return false;
}
emu_on_new_cd(0);
return false;
}
emu_on_new_cd(0);
@@
-393,8
+402,8
@@
void retro_run(void)
samples_to_send += 44100 / 60;
samples_to_send += 44100 / 60;
- video_cb(
game_fb_dirty ? vout_buf : NULL, game_width, game_height, game
_width * 2);
-
game
_fb_dirty = 0;
+ video_cb(
vout_fb_dirty ? vout_buf : NULL, vout_width, vout_height, vout
_width * 2);
+
vout
_fb_dirty = 0;
}
void retro_init(void)
}
void retro_init(void)
@@
-408,7
+417,7
@@
void retro_init(void)
ret = emu_core_preinit();
ret |= emu_core_init();
if (ret != 0) {
ret = emu_core_preinit();
ret |= emu_core_init();
if (ret != 0) {
-
printf("PCSX init failed, sorry
\n");
+
SysPrintf("PCSX init failed.
\n");
exit(1);
}
exit(1);
}
@@
-428,15
+437,24
@@
void retro_init(void)
}
}
if (f != NULL) {
}
}
if (f != NULL) {
-
p
rintf("found BIOS file: %s\n", Config.Bios);
+
SysP
rintf("found BIOS file: %s\n", Config.Bios);
fclose(f);
}
else
fclose(f);
}
else
-
p
rintf("no BIOS files found.\n");
+
SysP
rintf("no BIOS files found.\n");
level = 1;
environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
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);
McdDisable[0] = 0;
McdDisable[1] = 1;
init_memcard(Mcd1Data);