mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9600 from fjtrujy/psp/CleanUp

Browse Source 
PSP1 Some improvements
This commit is contained in:
Twinaphex 2019-10-16 01:06:49 +02:00 committed by GitHub
commit 615c581cd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/drivers/platform_psp.c
View File

@ -94,9 +94,9 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
logger_init(); logger_init();
#elif defined(HAVE_FILE_LOGGER) #elif defined(HAVE_FILE_LOGGER)
#ifndef VITA #ifndef VITA
retro_main_log_file_init("ms0:/temp/retroarch-log.txt"); retro_main_log_file_init("ms0:/temp/retroarch-log.txt", false);
#else #else
retro_main_log_file_init("ux0:/temp/retroarch-log.txt"); retro_main_log_file_init("ux0:/temp/retroarch-log.txt", false);
#endif #endif
#endif #endif
#endif #endif

41
gfx/drivers/psp1_gfx.c
View File

@ -471,20 +471,10 @@ static void *psp_init(const video_info_t *video,
return psp; return psp;
} }
#if 0
#define DISPLAY_FPS
#endif
static bool psp_frame(void *data, const void *frame, static bool psp_frame(void *data, const void *frame,
unsigned width, unsigned height, uint64_t frame_count, unsigned width, unsigned height, uint64_t frame_count,
unsigned pitch, const char *msg, video_frame_info_t *video_info) unsigned pitch, const char *msg, video_frame_info_t *video_info)
{ {
#ifdef DISPLAY_FPS
uint32_t diff;
static uint64_t currentTick,lastTick;
static int frames;
static float fps = 0.0;
#endif
psp1_video_t *psp = (psp1_video_t*)data; psp1_video_t *psp = (psp1_video_t*)data;
if (!width || !height) if (!width || !height)
@ -498,40 +488,19 @@ static bool psp_frame(void *data, const void *frame,
if (!psp->hw_render) if (!psp->hw_render)
sceGuSync(0, 0); /* let the core decide when to sync when HW_RENDER */ sceGuSync(0, 0); /* let the core decide when to sync when HW_RENDER */
pspDebugScreenSetBase(psp->draw_buffer); if (msg)
pspDebugScreenSetXY(0,0);
if (video_info->fps_show)
{ {
pspDebugScreenSetXY(68 - strlen(video_info->fps_text) - 1,0); pspDebugScreenSetBase(psp->draw_buffer);
pspDebugScreenPuts(video_info->fps_text); pspDebugScreenSetXY(0,0);
pspDebugScreenSetXY(0,1);
}
if (msg)
pspDebugScreenPuts(msg); pspDebugScreenPuts(msg);
}
if ((psp->vsync)&&(psp->vblank_not_reached)) if ((psp->vsync)&&(psp->vblank_not_reached))
sceDisplayWaitVblankStart(); sceDisplayWaitVblankStart();
psp->vblank_not_reached = true; psp->vblank_not_reached = true;
#ifdef DISPLAY_FPS
frames++;
sceRtcGetCurrentTick(&currentTick);
diff = currentTick - lastTick;
if(diff > 1000000)
{
fps = (float)frames * 1000000.0 / diff;
lastTick = currentTick;
frames = 0;
}
pspDebugScreenSetXY(0,0);
pspDebugScreenPrintf("%f", fps);
#endif
psp->draw_buffer = FROM_GU_POINTER(sceGuSwapBuffers()); psp->draw_buffer = FROM_GU_POINTER(sceGuSwapBuffers());
if (psp->should_resize) if (psp->should_resize)