Get rid of more performance counters

This commit is contained in:
twinaphex 2017-04-24 11:24:16 +02:00
parent 8f15467215
commit 5a3b78bad3
7 changed files with 0 additions and 57 deletions

View File

@ -40,7 +40,6 @@
#include "../../retroarch.h"
#include "../../verbosity.h"
#include "../../performance_counters.h"
#include "../common/ctr_common.h"
#ifndef HAVE_THREADS
@ -472,7 +471,6 @@ static bool ctr_frame(void* data, const void* frame,
static float fps = 0.0;
static int total_frames = 0;
static int frames = 0;
static struct retro_perf_counter ctrframe_f = {0};
extern bool select_pressed;
@ -612,9 +610,6 @@ static bool ctr_frame(void* data, const void* frame,
#endif
fflush(stdout);
performance_counter_init(ctrframe_f, "ctrframe_f");
performance_counter_start_plus(video_info->is_perfcnt_enable, ctrframe_f);
if (ctr->should_resize)
ctr_update_viewport(ctr);
@ -842,7 +837,6 @@ static bool ctr_frame(void* data, const void* frame,
ctr->current_buffer_top ^= 1;
ctr->p3d_event_pending = true;
ctr->ppf_event_pending = true;
performance_counter_stop_plus(video_info->is_perfcnt_enable, ctrframe_f);
return true;
}

View File

@ -1445,15 +1445,11 @@ static bool gx_frame(void *data, const void *frame,
video_frame_info_t *video_info)
{
char fps_text_buf[128];
static struct retro_perf_counter gx_frame = {0};
gx_video_t *gx = (gx_video_t*)data;
u8 clear_efb = GX_FALSE;
fps_text_buf[0] = '\0';
performance_counter_init(gx_frame, "gx_frame");
performance_counter_start_plus(video_info->is_perfcnt_enable, gx_frame);
if(!gx || (!frame && !gx->menu_texture_enable))
return true;
@ -1485,11 +1481,6 @@ static bool gx_frame(void *data, const void *frame,
if (frame)
{
static struct retro_perf_counter gx_frame_convert = {0};
performance_counter_init(gx_frame_convert, "gx_frame_convert");
performance_counter_start_plus(video_info->is_perfcnt_enable, gx_frame_convert);
if (gx->rgb32)
convert_texture32(frame, g_tex.data, width, height, pitch);
else if (gx->menu_texture_enable)
@ -1497,8 +1488,6 @@ static bool gx_frame(void *data, const void *frame,
else
convert_texture16(frame, g_tex.data, width, height, pitch);
DCFlushRange(g_tex.data, height * (width << (gx->rgb32 ? 2 : 1)));
performance_counter_stop_plus(video_info->is_perfcnt_enable, gx_frame_convert);
}
if (gx->menu_texture_enable && gx->menu_data)
@ -1582,8 +1571,6 @@ static bool gx_frame(void *data, const void *frame,
VIDEO_SetNextFramebuffer(gx->framebuf[g_current_framebuf]);
VIDEO_Flush();
performance_counter_stop_plus(video_info->is_perfcnt_enable, gx_frame);
return true;
}

View File

@ -484,7 +484,6 @@ static bool psp_frame(void *data, const void *frame,
static int frames;
static float fps = 0.0;
#endif
static struct retro_perf_counter psp_frame_run = {0};
psp1_video_t *psp = (psp1_video_t*)data;
if (!width || !height)
@ -534,9 +533,6 @@ static bool psp_frame(void *data, const void *frame,
psp->draw_buffer = FROM_GU_POINTER(sceGuSwapBuffers());
performance_counter_init(psp_frame_run, "psp_frame_run");
performance_counter_start_plus(video_info->is_perfcnt_enable, psp_frame_run);
if (psp->should_resize)
psp_update_viewport(psp, video_info);
@ -568,8 +564,6 @@ static bool psp_frame(void *data, const void *frame,
sceGuFinish();
performance_counter_stop_plus(video_info->is_perfcnt_enable, psp_frame_run);
#ifdef HAVE_MENU
menu_driver_frame(video_info);
#endif

View File

@ -40,7 +40,6 @@
#include "../../configuration.h"
#include "../../retroarch.h"
#include "../../performance_counters.h"
#include "../../verbosity.h"
#include "../video_context_driver.h"
@ -503,17 +502,9 @@ static bool sdl2_gfx_frame(void *data, const void *frame, unsigned width,
if (frame && video_info->libretro_running)
{
static struct retro_perf_counter sdl_copy_frame = {0};
SDL_RenderClear(vid->renderer);
sdl_refresh_input_size(vid, false, vid->video.rgb32, width, height, pitch);
performance_counter_init(sdl_copy_frame, "sdl_copy_frame");
performance_counter_start_plus(video_info->is_perfcnt_enable, sdl_copy_frame);
SDL_UpdateTexture(vid->frame.tex, NULL, frame, pitch);
performance_counter_stop_plus(video_info->is_perfcnt_enable, sdl_copy_frame);
}
SDL_RenderCopyEx(vid->renderer, vid->frame.tex, NULL, NULL, vid->rotation, NULL, SDL_FLIP_NONE);

View File

@ -43,7 +43,6 @@
#include "../video_driver.h"
#include "../../configuration.h"
#include "../../performance_counters.h"
#include "../video_context_driver.h"
@ -339,7 +338,6 @@ static bool sdl_gfx_frame(void *data, const void *frame, unsigned width,
unsigned height, uint64_t frame_count,
unsigned pitch, const char *msg, video_frame_info_t *video_info)
{
static struct retro_perf_counter sdl_scale = {0};
sdl_video_t *vid = (sdl_video_t*)data;
char title[128];
@ -353,9 +351,6 @@ static bool sdl_gfx_frame(void *data, const void *frame, unsigned width,
if (SDL_MUSTLOCK(vid->screen))
SDL_LockSurface(vid->screen);
performance_counter_init(sdl_scale, "sdl_scale");
performance_counter_start_plus(video_info->is_perfcnt_enable, sdl_scale);
video_frame_scale(
&vid->scaler,
vid->screen->pixels,
@ -367,7 +362,6 @@ static bool sdl_gfx_frame(void *data, const void *frame, unsigned width,
width,
height,
pitch);
performance_counter_stop_plus(video_info->is_perfcnt_enable, sdl_scale);
#ifdef HAVE_MENU
menu_driver_frame(video_info);

View File

@ -41,7 +41,6 @@
#include "../../retroarch.h"
#include "../../driver.h"
#include "../../performance_counters.h"
#include "../../content.h"
#include "../../verbosity.h"
#include "../../configuration.h"
@ -386,14 +385,9 @@ static bool vg_frame(void *data, const void *frame,
video_frame_info_t *video_info)
{
vg_t *vg = (vg_t*)data;
static struct retro_perf_counter vg_fr = {0};
static struct retro_perf_counter vg_image = {0};
unsigned width = video_info->width;
unsigned height = video_info->height;
performance_counter_init(vg_fr, "vg_fr");
performance_counter_start_plus(video_info->is_perfcnt_enable, vg_fr);
if ( frame_width != vg->mRenderWidth
|| frame_height != vg->mRenderHeight
|| vg->should_resize)
@ -416,10 +410,7 @@ static bool vg_frame(void *data, const void *frame,
vgClear(0, 0, width, height);
vgSeti(VG_SCISSORING, VG_TRUE);
performance_counter_init(vg_image, "vg_image");
performance_counter_start_plus(video_info->is_perfcnt_enable, vg_image);
vg_copy_frame(vg, frame, frame_width, frame_height, pitch);
performance_counter_stop_plus(video_info->is_perfcnt_enable, vg_image);
#ifdef HAVE_MENU
menu_driver_frame(video_info);
@ -434,8 +425,6 @@ static bool vg_frame(void *data, const void *frame,
video_context_driver_update_window_title(video_info);
performance_counter_stop_plus(video_info->is_perfcnt_enable, vg_fr);
video_context_driver_swap_buffers(video_info);
return true;

View File

@ -21,7 +21,6 @@
#include "../../driver.h"
#include "../../configuration.h"
#include "../../verbosity.h"
#include "performance_counters.h"
#ifdef HAVE_CONFIG_H
#include "../../config.h"
@ -616,10 +615,6 @@ static bool wiiu_gfx_frame(void* data, const void* frame,
printf("\rfps: %8.8f frames : %5i", fps, wiiu->frames++);
fflush(stdout);
static struct retro_perf_counter gfx_frame_perf = {0};
performance_counter_init(gfx_frame_perf, "gfx_frame");
performance_counter_start_plus(video_info->is_perfcnt_enable, gfx_frame_perf);
if (wiiu->should_resize)
wiiu_gfx_update_viewport(wiiu);
@ -702,7 +697,6 @@ static bool wiiu_gfx_frame(void* data, const void* frame,
GX2SwapScanBuffers();
GX2Flush();
performance_counter_stop_plus(video_info->is_perfcnt_enable, gfx_frame_perf);
return true;
}