diff options
author | notaz | 2015-02-06 01:29:00 +0200 |
---|---|---|
committer | notaz | 2015-02-06 01:29:00 +0200 |
commit | 2af7e74feec67c0a798ac190774cb4b3e925be76 (patch) | |
tree | 27a148679e25f6edb7a2dd85c54514139bb72450 /frontend | |
parent | cebb70f24ab54693b12aaa27b85a52689e26e1ff (diff) | |
parent | 1e0eac2348343c8a046f7a75d460f087556cf7f6 (diff) | |
download | pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.gz pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.bz2 pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.zip |
Merge branch 'upstream' into libretro
Diffstat (limited to 'frontend')
m--------- | frontend/libpicofe | 0 | ||||
-rw-r--r-- | frontend/libretro.c | 3 | ||||
-rw-r--r-- | frontend/plat_omap.c | 3 | ||||
-rw-r--r-- | frontend/plugin_lib.c | 12 |
4 files changed, 11 insertions, 7 deletions
diff --git a/frontend/libpicofe b/frontend/libpicofe -Subproject 515ac0b9d2c4d45a465335d54b8c49830914fce +Subproject 9fec8a91c9b19856ac0b51de53b847b38ed8dc6 diff --git a/frontend/libretro.c b/frontend/libretro.c index 38514b5..acc64a1 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -283,7 +283,7 @@ void retro_get_system_info(struct retro_system_info *info) { memset(info, 0, sizeof(*info)); info->library_name = "PCSX-ReARMed"; - info->library_version = "r21"; + info->library_version = "r22"; info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u"; info->need_fullpath = true; } @@ -1255,6 +1255,7 @@ void retro_init(void) cycle_multiplier = 200; #endif pl_rearmed_cbs.gpu_peops.iUseDither = 1; + spu_config.iUseFixedUpdates = 1; McdDisable[0] = 0; McdDisable[1] = 1; diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c index 4e3ea79..f25f31c 100644 --- a/frontend/plat_omap.c +++ b/frontend/plat_omap.c @@ -111,10 +111,11 @@ void *plat_gvideo_set_mode(int *w_in, int *h_in, int *bpp) } } - vout_fbdev_clear(layer_fb); buf = vout_fbdev_resize(layer_fb, w, h, *bpp, l, r, t, b, 3); + vout_fbdev_clear(layer_fb); + omap_enable_layer(1); return buf; diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index 56da763..ab4d415 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -34,6 +34,8 @@ #include "../libpcsxcore/psxmem_map.h" #include "../plugins/dfinput/externals.h" +#define HUD_HEIGHT 10 + int in_type1, in_type2; int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 }; int in_adev[2] = { -1, -1 }, in_adev_axis[2][2] = {{ 0, 1 }, { 0, 1 }}; @@ -101,20 +103,20 @@ static void hud_printf(void *fb, int w, int x, int y, const char *texto, ...) static void print_msg(int h, int border) { - hud_print(pl_vout_buf, pl_vout_w, border + 2, h - 10, hud_msg); + hud_print(pl_vout_buf, pl_vout_w, border + 2, h - HUD_HEIGHT, hud_msg); } static void print_fps(int h, int border) { - hud_printf(pl_vout_buf, pl_vout_w, border + 2, h - 10, + hud_printf(pl_vout_buf, pl_vout_w, border + 2, h - HUD_HEIGHT, "%2d %4.1f", pl_rearmed_cbs.flips_per_sec, pl_rearmed_cbs.vsps_cur); } static void print_cpu_usage(int w, int h, int border) { - hud_printf(pl_vout_buf, pl_vout_w, pl_vout_w - border - 28, h - 10, - "%3d", pl_rearmed_cbs.cpu_usage); + hud_printf(pl_vout_buf, pl_vout_w, pl_vout_w - border - 28, + h - HUD_HEIGHT, "%3d", pl_rearmed_cbs.cpu_usage); } // draw 192x8 status of 24 sound channels @@ -126,7 +128,7 @@ static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h) static const unsigned short colors[2] = { 0x1fe3, 0x0700 }; unsigned short *dest = (unsigned short *)pl_vout_buf + - vout_w * (vout_h - 10) + vout_w / 2 - 192/2; + vout_w * (vout_h - HUD_HEIGHT) + vout_w / 2 - 192/2; unsigned short *d, p; int c, x, y; |