Take out runloop-related code in gfx/video_driver.c's init_video

function
This commit is contained in:
twinaphex 2015-05-09 10:41:36 +02:00
parent dcfa47c23b
commit 6fbd9df9d9
2 changed files with 6 additions and 8 deletions

View File

@ -365,8 +365,9 @@ static void menu_update_libretro_info(void)
**/
void init_drivers(int flags)
{
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
if (flags & DRIVER_VIDEO)
driver->video_data_own = false;
@ -389,6 +390,9 @@ void init_drivers(int flags)
if (flags & DRIVER_VIDEO)
{
runloop->frames.video.count = 0;
runloop->measure_data.frame_time_samples_count = 0;
init_video();
if (!driver->video_cache_context_ack

View File

@ -22,7 +22,6 @@
#include "video_monitor.h"
#include "../general.h"
#include "../retroarch.h"
#include "../runloop.h"
static const video_driver_t *video_drivers[] = {
#ifdef HAVE_OPENGL
@ -437,13 +436,10 @@ void init_video(void)
const struct retro_game_geometry *geom = NULL;
video_info_t video = {0};
static uint16_t dummy_pixels[32] = {0};
runloop_t *runloop = rarch_main_get_ptr();
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr();
runloop->frames.video.count = 0;
init_video_filter(global->system.pix_fmt);
event_command(EVENT_CMD_SHADER_DIR_INIT);
@ -576,8 +572,6 @@ void init_video(void)
event_command(EVENT_CMD_OVERLAY_DEINIT);
event_command(EVENT_CMD_OVERLAY_INIT);
runloop->measure_data.frame_time_samples_count = 0;
global->frame_cache.width = 4;
global->frame_cache.height = 4;
global->frame_cache.pitch = 8;