From 6fbd9df9d9ae07dd060d708c7f65bc8453ce4f90 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 9 May 2015 10:41:36 +0200 Subject: [PATCH] Take out runloop-related code in gfx/video_driver.c's init_video function --- driver.c | 8 ++++++-- gfx/video_driver.c | 6 ------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/driver.c b/driver.c index 15b4e67bd5..3f18b5d0cf 100644 --- a/driver.c +++ b/driver.c @@ -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 diff --git a/gfx/video_driver.c b/gfx/video_driver.c index c795696b7c..3d1b2f7553 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -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;