mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Xbox 1) FPS reporting for Xbox 1

Browse Source
This commit is contained in:
twinaphex 2012-07-15 19:12:58 +02:00
parent 15e08db76e
commit aa150c439f
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console/griffin/griffin.c
View File

@ -98,6 +98,8 @@ VIDEO DRIVER
#include "../../wii/video.c" #include "../../wii/video.c"
#endif #endif
#include "../../gfx/gfx_common.c"
#ifdef _XBOX #ifdef _XBOX
#if defined(HAVE_D3D9) #if defined(HAVE_D3D9)
#include "../../360/xdk_d3d9.cpp" #include "../../360/xdk_d3d9.cpp"

4
gfx/gfx_common.c
View File

@ -19,8 +19,10 @@
#ifndef _MSC_VER #ifndef _MSC_VER
#include <sys/time.h> #include <sys/time.h>
#else #else
#ifndef _XBOX
#include <winsock2.h> #include <winsock2.h>
#include <mmsystem.h> #include <mmsystem.h>
#endif
static int gettimeofday(struct timeval *val, void *dummy) static int gettimeofday(struct timeval *val, void *dummy)
{ {
(void)dummy; (void)dummy;
@ -96,7 +98,7 @@ bool gfx_window_title(char *buf, size_t size)
return ret; return ret;
} }
#ifdef _WIN32 #if defined(_WIN32) && !defined(_XBOX)
#include <windows.h> #include <windows.h>
#include "../dynamic.h" #include "../dynamic.h"
// We only load this library once, so we let it be unloaded at application shutdown, // We only load this library once, so we let it be unloaded at application shutdown,

31
xbox1/xdk_d3d8.cpp
View File

@ -31,6 +31,8 @@
#include "config.h" #include "config.h"
#endif #endif
wchar_t strw_buffer[128];
static void check_window(xdk_d3d_video_t *d3d) static void check_window(xdk_d3d_video_t *d3d)
{ {
bool quit, resize; bool quit, resize;
@ -441,22 +443,29 @@ static bool xdk_d3d_frame(void *data, const void *frame,
d3d->d3d_render_device->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &d3d->pBackBuffer); d3d->d3d_render_device->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &d3d->pBackBuffer);
//Output memory usage //Output memory usage
d3d->debug_font->TextOut(d3d->pFrontBuffer, L"RetroArch XBOX1", (unsigned)-1, 30, 30 );
d3d->debug_font->TextOut(d3d->pBackBuffer, L"RetroArch XBOX1", (unsigned)-1, 30, 30 );
swprintf(d3d->buffer, L"%.2f MB free / %.2f MB total", stat.dwAvailPhys/(1024.0f*1024.0f), stat.dwTotalPhys/(1024.0f*1024.0f)); char buf[128], buf2[128], buf_fps_last[128];
d3d->debug_font->TextOut(d3d->pFrontBuffer, d3d->buffer, (unsigned)-1, 30, 50 ); bool ret = false;
d3d->debug_font->TextOut(d3d->pBackBuffer, d3d->buffer, (unsigned)-1, 30, 50 ); sprintf(buf, "%.2f MB free / %.2f MB total", stat.dwAvailPhys/(1024.0f*1024.0f), stat.dwTotalPhys/(1024.0f*1024.0f));
rarch_convert_char_to_wchar(strw_buffer, buf, sizeof(strw_buffer));
d3d->debug_font->TextOut(d3d->pFrontBuffer, strw_buffer, (unsigned)-1, 30, 50 );
d3d->debug_font->TextOut(d3d->pBackBuffer, strw_buffer, (unsigned)-1, 30, 50 );
// FIXME: Add fps counter if(ret = gfx_window_title(buf2, sizeof(buf2)) || buf_fps_last)
/* {
swprintf(buffer, L"%02d / %02d FPS", fps, IsPal ? 50 : 60); if(ret)
d3d->debug_font->TextOut(d3d->pFrontBuffer, d3d->buffer, (unsigned)-1, 30, 70 ); {
d3d->debug_font->TextOut(d3d->pBackBuffer, d3d->buffer, (unsigned)-1, 30, 70 ); sprintf(buf_fps_last, buf2);
*/ rarch_convert_char_to_wchar(strw_buffer, buf2, sizeof(strw_buffer));
}
else if(buf_fps_last)
rarch_convert_char_to_wchar(strw_buffer, buf_fps_last, sizeof(strw_buffer));
d3d->debug_font->TextOut(d3d->pFrontBuffer, strw_buffer, (unsigned)-1, 30, 70 );
d3d->debug_font->TextOut(d3d->pBackBuffer, strw_buffer, (unsigned)-1, 30, 70 );
d3d->pFrontBuffer->Release(); d3d->pFrontBuffer->Release();
d3d->pBackBuffer->Release(); d3d->pBackBuffer->Release();
}
#endif #endif
if(!d3d->block_swap) if(!d3d->block_swap)

1
xbox1/xdk_d3d8.h
View File

@ -83,7 +83,6 @@ typedef struct xdk_d3d_video
DWORD video_mode; DWORD video_mode;
D3DPRESENT_PARAMETERS d3dpp; D3DPRESENT_PARAMETERS d3dpp;
XFONT *debug_font; XFONT *debug_font;
WCHAR buffer[1000];
D3DSurface *pBackBuffer, *pFrontBuffer; D3DSurface *pBackBuffer, *pFrontBuffer;
} xdk_d3d_video_t; } xdk_d3d_video_t;