(D3D9) Fix up D3D driver - use RARC_PERFORMANCE macros

This commit is contained in:
twinaphex 2013-12-22 17:41:08 +01:00
parent 129b7093a3
commit bb82c76a4c

View File

@ -284,9 +284,8 @@ void D3DVideo::viewport_info(rarch_viewport &vp)
bool D3DVideo::read_viewport(uint8_t *buffer) bool D3DVideo::read_viewport(uint8_t *buffer)
{ {
static retro_perf_counter_t d3d_read_viewport = { "d3d_read_viewport", 0, 0, 0, false }; RARCH_PERFORMANCE_INIT(d3d_read_viewport);
rarch_perf_init(&d3d_read_viewport, g_settings.perfcounter_enable); RARCH_PERFORMANCE_START(d3d_read_viewport);
rarch_perf_start(&d3d_read_viewport, g_settings.perfcounter_enable);
bool ret = true; bool ret = true;
IDirect3DSurface9 *target = nullptr; IDirect3DSurface9 *target = nullptr;
IDirect3DSurface9 *dest = nullptr; IDirect3DSurface9 *dest = nullptr;
@ -339,7 +338,7 @@ bool D3DVideo::read_viewport(uint8_t *buffer)
} }
end: end:
rarch_perf_stop(&d3d_read_viewport, g_settings.perfcounter_enable); RARCH_PERFORMANCE_STOP(d3d_read_viewport);
if (target) if (target)
target->Release(); target->Release();
if (dest) if (dest)
@ -607,9 +606,8 @@ bool D3DVideo::frame(const void *frame,
if (!frame) if (!frame)
return true; return true;
static retro_perf_counter_t d3d_frame = { "d3d_frame", 0, 0, 0, false }; RARCH_PERFORMANCE_INIT(d3d_frame);
rarch_perf_init(&d3d_frame, g_settings.perfcounter_enable); RARCH_PERFORMANCE_START(d3d_frame);
rarch_perf_start(&d3d_frame, g_settings.perfcounter_enable);
// We cannot recover in fullscreen. // We cannot recover in fullscreen.
if (needs_restore && IsIconic(hWnd)) if (needs_restore && IsIconic(hWnd))
return true; return true;
@ -672,7 +670,7 @@ bool D3DVideo::frame(const void *frame,
} }
#endif #endif
rarch_perf_stop(&d3d_frame, g_settings.perfcounter_enable); RARCH_PERFORMANCE_STOP(d3d_frame);
if (dev->Present(nullptr, nullptr, nullptr, nullptr) != D3D_OK) if (dev->Present(nullptr, nullptr, nullptr, nullptr) != D3D_OK)
{ {