CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-14 14:50:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of PERF_ENABLE blocks

Browse Source
This commit is contained in:
twinaphex 2017-04-24 11:20:30 +02:00
parent e411e7c284
commit d06c963a19
4 changed files with 0 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/drivers/d3d.cpp
View File

@ -50,7 +50,6 @@
#include "../font_driver.h"
#include "../../core.h"
#include "../../performance_counters.h"
#include "../../defines/d3d_defines.h"
#include "../../verbosity.h"
@ -1387,8 +1386,6 @@ static bool d3d_frame(void *data, const void *frame,
uint64_t frame_count, unsigned pitch,
const char *msg, video_frame_info_t *video_info)
{
static struct
retro_perf_counter d3d_frame = {0};
unsigned i = 0;
d3d_video_t *d3d = (d3d_video_t*)data;
HWND window = win32_get_window();
@ -1400,9 +1397,6 @@ static bool d3d_frame(void *data, const void *frame,
if (!frame)
return true;
performance_counter_init(d3d_frame, "d3d_frame");
performance_counter_start_plus(video_info->is_perfcnt_enable, d3d_frame);
/* We cannot recover in fullscreen. */
if (d3d->needs_restore)
{
@ -1480,8 +1474,6 @@ static bool d3d_frame(void *data, const void *frame,
video_context_driver_update_window_title(video_info);
performance_counter_stop_plus(video_info->is_perfcnt_enable, d3d_frame);
video_context_driver_swap_buffers(video_info);
return true;

37
gfx/drivers/gl.c
View File

@ -44,9 +44,6 @@
#include "../../configuration.h"
#include "../../record/record_driver.h"
#ifdef PERF_ENABLE
#include "../../performance_counters.h"
#endif
#include "../../retroarch.h"
#include "../../verbosity.h"
@ -690,13 +687,6 @@ static INLINE void gl_copy_frame(gl_t *gl,
const void *frame,
unsigned width, unsigned height, unsigned pitch)
{
#ifdef PERF_ENABLE
static struct retro_perf_counter copy_frame = {0};
performance_counter_init(copy_frame, "copy_frame");
performance_counter_start_plus(video_info->is_perfcnt_enable, copy_frame);
#endif
#if defined(HAVE_PSGL)
{
unsigned h;
@ -825,9 +815,6 @@ static INLINE void gl_copy_frame(gl_t *gl,
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
}
#endif
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable, copy_frame);
#endif
}
static INLINE void gl_set_shader_viewport(gl_t *gl, unsigned idx)
@ -1101,13 +1088,6 @@ static bool gl_frame(void *data, const void *frame,
unsigned width = video_info->width;
unsigned height = video_info->height;
#ifdef PERF_ENABLE
static struct
retro_perf_counter frame_run = {0};
performance_counter_init(frame_run, "frame_run");
performance_counter_start_plus(video_info->is_perfcnt_enable, frame_run);
#endif
if (!gl)
return false;
@ -1297,10 +1277,6 @@ static bool gl_frame(void *data, const void *frame,
video_context_driver_update_window_title(video_info);
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable, frame_run);
#endif
#ifdef HAVE_FBO
/* Reset state which could easily mess up libretro core. */
if (gl->hw_render_fbo_init)
@ -1357,14 +1333,6 @@ static bool gl_frame(void *data, const void *frame,
#ifdef HAVE_GL_SYNC
if (video_info->hard_sync && gl->have_sync)
{
#ifdef PERF_ENABLE
static struct retro_perf_counter gl_fence = {0};
performance_counter_init(gl_fence, "gl_fence");
performance_counter_start_plus(video_info->is_perfcnt_enable,
gl_fence);
#endif
glClear(GL_COLOR_BUFFER_BIT);
gl->fences[gl->fence_count++] =
glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
@ -1379,11 +1347,6 @@ static bool gl_frame(void *data, const void *frame,
memmove(gl->fences, gl->fences + 1,
gl->fence_count * sizeof(GLsync));
}
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable,
gl_fence);
#endif
}
#endif

60
gfx/drivers/vulkan.c
View File

@ -43,9 +43,6 @@
#include "../../driver.h"
#include "../../configuration.h"
#include "../../record/record_driver.h"
#ifdef PERF_ENABLE
#include "../../performance_counters.h"
#endif
#include "../../retroarch.h"
#include "../../verbosity.h"
@ -1583,15 +1580,6 @@ static bool vulkan_frame(void *data, const void *frame,
VkSemaphore signal_semaphores[2];
vk_t *vk = (vk_t*)data;
struct vk_per_frame *chain = NULL;
#ifdef PERF_ENABLE
static struct retro_perf_counter frame_run = {0};
static struct retro_perf_counter begin_cmd = {0};
static struct retro_perf_counter build_cmd = {0};
static struct retro_perf_counter end_cmd = {0};
static struct retro_perf_counter copy_frame = {0};
static struct retro_perf_counter swapbuffers = {0};
static struct retro_perf_counter queue_submit = {0};
#endif
bool waits_for_semaphores = false;
unsigned width = video_info->width;
unsigned height = video_info->height;
@ -1606,18 +1594,6 @@ static bool vulkan_frame(void *data, const void *frame,
unsigned frame_index =
vk->context->current_swapchain_index;
#ifdef PERF_ENABLE
performance_counter_init(frame_run, "frame_run");
performance_counter_init(copy_frame, "copy_frame");
performance_counter_init(swapbuffers, "swapbuffers");
performance_counter_init(queue_submit, "queue_submit");
performance_counter_init(begin_cmd, "begin_command");
performance_counter_init(build_cmd, "build_command");
performance_counter_init(end_cmd, "end_command");
performance_counter_start_plus(video_info->is_perfcnt_enable, frame_run);
#endif
/* Bookkeeping on start of frame. */
chain = &vk->swapchain[frame_index];
vk->chain = chain;
@ -1626,18 +1602,12 @@ static bool vulkan_frame(void *data, const void *frame,
vulkan_buffer_chain_discard(&chain->vbo);
vulkan_buffer_chain_discard(&chain->ubo);
#ifdef PERF_ENABLE
performance_counter_start_plus(video_info->is_perfcnt_enable, begin_cmd);
#endif
/* Start recording the command buffer. */
vk->cmd = chain->cmd;
begin_info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
vkResetCommandBuffer(vk->cmd, 0);
vkBeginCommandBuffer(vk->cmd, &begin_info);
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable, begin_cmd);
#endif
memset(&vk->tracker, 0, sizeof(vk->tracker));
@ -1662,9 +1632,6 @@ static bool vulkan_frame(void *data, const void *frame,
}
/* Upload texture */
#ifdef PERF_ENABLE
performance_counter_start_plus(video_info->is_perfcnt_enable, copy_frame);
#endif
if (frame && !vk->hw.enable)
{
unsigned y;
@ -1715,17 +1682,11 @@ static bool vulkan_frame(void *data, const void *frame,
vk->last_valid_index = frame_index;
}
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable, copy_frame);
#endif
/* Notify filter chain about the new sync index. */
vulkan_filter_chain_notify_sync_index((vulkan_filter_chain_t*)vk->filter_chain, frame_index);
vulkan_filter_chain_set_frame_count((vulkan_filter_chain_t*)vk->filter_chain, frame_count);
#ifdef PERF_ENABLE
performance_counter_start_plus(video_info->is_perfcnt_enable, build_cmd);
#endif
/* Render offscreen filter chain passes. */
{
/* Set the source texture in the filter chain */
@ -1854,9 +1815,6 @@ static bool vulkan_frame(void *data, const void *frame,
if (vk->overlay.enable)
vulkan_render_overlay(vk, video_info);
#endif
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable, build_cmd);
#endif
/* End the render pass. We're done rendering to backbuffer now. */
vkCmdEndRenderPass(vk->cmd);
@ -1925,13 +1883,7 @@ static bool vulkan_frame(void *data, const void *frame,
vk->context->graphics_queue_index, vk->hw.src_queue_family);
}
#ifdef PERF_ENABLE
performance_counter_start_plus(video_info->is_perfcnt_enable, end_cmd);
#endif
vkEndCommandBuffer(vk->cmd);
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable, end_cmd);
#endif
/* Submit command buffers to GPU. */
@ -1973,11 +1925,6 @@ static bool vulkan_frame(void *data, const void *frame,
}
submit_info.pSignalSemaphores = submit_info.signalSemaphoreCount ? signal_semaphores : NULL;
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable, frame_run);
performance_counter_start_plus(video_info->is_perfcnt_enable, queue_submit);
#endif
#ifdef HAVE_THREADS
slock_lock(vk->context->queue_lock);
@ -1988,16 +1935,9 @@ static bool vulkan_frame(void *data, const void *frame,
slock_unlock(vk->context->queue_lock);
#endif
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable, queue_submit);
performance_counter_start_plus(video_info->is_perfcnt_enable, swapbuffers);
#endif
video_context_driver_swap_buffers(video_info);
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable, swapbuffers);
#endif
if (!vk->context->swap_interval_emulation_lock)
video_context_driver_update_window_title(video_info);

15
gfx/video_thread_wrapper.c
View File

@ -26,9 +26,6 @@
#include "font_driver.h"
#include "video_shader_driver.h"
#ifdef PERF_ENABLE
#include "../performance_counters.h"
#endif
#include "../runloop.h"
#include "../verbosity.h"
@ -720,9 +717,6 @@ static bool video_thread_frame(void *data, const void *frame_,
unsigned pitch, const char *msg, video_frame_info_t *video_info)
{
unsigned copy_stride;
#ifdef PERF_ENABLE
static struct retro_perf_counter thr_frame = {0};
#endif
const uint8_t *src = NULL;
uint8_t *dst = NULL;
thread_video_t *thr = (thread_video_t*)data;
@ -739,11 +733,6 @@ static bool video_thread_frame(void *data, const void *frame_,
return false;
}
#ifdef PERF_ENABLE
performance_counter_init(thr_frame, "thr_frame");
performance_counter_start_plus(video_info->is_perfcnt_enable, thr_frame);
#endif
copy_stride = width * (thr->info.rgb32
? sizeof(uint32_t) : sizeof(uint16_t));
@ -811,10 +800,6 @@ static bool video_thread_frame(void *data, const void *frame_,
slock_unlock(thr->lock);
#ifdef PERF_ENABLE
performance_counter_stop_plus(video_info->is_perfcnt_enable, thr_frame);
#endif
thr->last_time = cpu_features_get_time_usec();
return true;
}