diff --git a/driver.c b/driver.c index a16f798028..781033a777 100644 --- a/driver.c +++ b/driver.c @@ -20,12 +20,8 @@ #include #include #include "compat/posix_string.h" -#include "gfx/video_thread_wrapper.h" #include "gfx/video_monitor.h" -#include "gfx/video_viewport.h" -#include "gfx/video_pixel_converter.h" #include "audio/audio_monitor.h" -#include "gfx/drivers_context/win32_dwm_common.h" #ifdef HAVE_MENU #include "menu/menu.h" @@ -290,259 +286,6 @@ bool driver_update_system_av_info(const struct retro_system_av_info *info) return true; } -static void deinit_video_filter(void) -{ - rarch_softfilter_free(g_extern.filter.filter); - free(g_extern.filter.buffer); - memset(&g_extern.filter, 0, sizeof(g_extern.filter)); -} - -static void init_video_filter(enum retro_pixel_format colfmt) -{ - unsigned width, height, pow2_x, pow2_y, maxsize; - struct retro_game_geometry *geom = NULL; - - deinit_video_filter(); - - if (!*g_settings.video.softfilter_plugin) - return; - - /* Deprecated format. Gets pre-converted. */ - if (colfmt == RETRO_PIXEL_FORMAT_0RGB1555) - colfmt = RETRO_PIXEL_FORMAT_RGB565; - - if (g_extern.system.hw_render_callback.context_type) - { - RARCH_WARN("Cannot use CPU filters when hardware rendering is used.\n"); - return; - } - - geom = (struct retro_game_geometry*)&g_extern.system.av_info.geometry; - width = geom->max_width; - height = geom->max_height; - - g_extern.filter.filter = rarch_softfilter_new( - g_settings.video.softfilter_plugin, - RARCH_SOFTFILTER_THREADS_AUTO, colfmt, width, height); - - if (!g_extern.filter.filter) - { - RARCH_ERR("Failed to load filter.\n"); - return; - } - - rarch_softfilter_get_max_output_size(g_extern.filter.filter, - &width, &height); - - pow2_x = next_pow2(width); - pow2_y = next_pow2(height); - maxsize = max(pow2_x, pow2_y); - g_extern.filter.scale = maxsize / RARCH_SCALE_BASE; - - g_extern.filter.out_rgb32 = rarch_softfilter_get_output_format( - g_extern.filter.filter) == RETRO_PIXEL_FORMAT_XRGB8888; - - g_extern.filter.out_bpp = g_extern.filter.out_rgb32 ? - sizeof(uint32_t) : sizeof(uint16_t); - - /* TODO: Aligned output. */ - g_extern.filter.buffer = malloc(width * height * g_extern.filter.out_bpp); - if (!g_extern.filter.buffer) - goto error; - - return; - -error: - RARCH_ERR("Softfilter initialization failed.\n"); - deinit_video_filter(); -} - -static void init_video_input(const input_driver_t *tmp) -{ - /* Video driver didn't provide an input driver, - * so we use configured one. */ - RARCH_LOG("Graphics driver did not initialize an input driver. Attempting to pick a suitable driver.\n"); - - if (tmp) - driver.input = tmp; - else - find_input_driver(); - - if (!driver.input) - { - /* This should never really happen as tmp (driver.input) is always - * found before this in find_driver_input(), or we have aborted - * in a similar fashion anyways. */ - rarch_fail(1, "init_video_input()"); - } - - driver.input_data = driver.input->init(); - - if (driver.input_data) - return; - - RARCH_ERR("Cannot initialize input driver. Exiting ...\n"); - rarch_fail(1, "init_video_input()"); -} - -static void init_video(void) -{ - unsigned max_dim, scale, width, height; - rarch_viewport_t *custom_vp; - const input_driver_t *tmp = NULL; - const struct retro_game_geometry *geom = NULL; - video_info_t video = {0}; - static uint16_t dummy_pixels[32] = {0}; - - init_video_filter(g_extern.system.pix_fmt); - rarch_main_command(RARCH_CMD_SHADER_DIR_INIT); - - geom = (const struct retro_game_geometry*)&g_extern.system.av_info.geometry; - max_dim = max(geom->max_width, geom->max_height); - scale = next_pow2(max_dim) / RARCH_SCALE_BASE; - scale = max(scale, 1); - - if (g_extern.filter.filter) - scale = g_extern.filter.scale; - - /* Update core-dependent aspect ratio values. */ - video_viewport_set_square_pixel(geom->base_width, geom->base_height); - video_viewport_set_core(); - video_viewport_set_config(); - - /* Update CUSTOM viewport. */ - custom_vp = (rarch_viewport_t*)&g_extern.console.screen.viewports.custom_vp; - if (g_settings.video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM) - { - float default_aspect = aspectratio_lut[ASPECT_RATIO_CORE].value; - aspectratio_lut[ASPECT_RATIO_CUSTOM].value = - (custom_vp->width && custom_vp->height) ? - (float)custom_vp->width / custom_vp->height : default_aspect; - } - - g_extern.system.aspect_ratio = - aspectratio_lut[g_settings.video.aspect_ratio_idx].value; - - if (g_settings.video.fullscreen) - { - width = g_settings.video.fullscreen_x; - height = g_settings.video.fullscreen_y; - } - else - { - if (g_settings.video.force_aspect) - { - /* Do rounding here to simplify integer scale correctness. */ - unsigned base_width = roundf(geom->base_height * - g_extern.system.aspect_ratio); - width = roundf(base_width * g_settings.video.scale); - height = roundf(geom->base_height * g_settings.video.scale); - } - else - { - width = roundf(geom->base_width * g_settings.video.scale); - height = roundf(geom->base_height * g_settings.video.scale); - } - } - - if (width && height) - RARCH_LOG("Video @ %ux%u\n", width, height); - else - RARCH_LOG("Video @ fullscreen\n"); - - driver.display_type = RARCH_DISPLAY_NONE; - driver.video_display = 0; - driver.video_window = 0; - - if (!init_video_pixel_converter(RARCH_SCALE_BASE * scale)) - { - RARCH_ERR("Failed to initialize pixel converter.\n"); - rarch_fail(1, "init_video()"); - } - - video.width = width; - video.height = height; - video.fullscreen = g_settings.video.fullscreen; - video.vsync = g_settings.video.vsync && !g_extern.system.force_nonblock; - video.force_aspect = g_settings.video.force_aspect; -#ifdef GEKKO - video.viwidth = g_settings.video.viwidth; - video.vfilter = g_settings.video.vfilter; -#endif - video.smooth = g_settings.video.smooth; - video.input_scale = scale; - video.rgb32 = g_extern.filter.filter ? - g_extern.filter.out_rgb32 : - (g_extern.system.pix_fmt == RETRO_PIXEL_FORMAT_XRGB8888); - - tmp = (const input_driver_t*)driver.input; - /* Need to grab the "real" video driver interface on a reinit. */ - find_video_driver(); - -#ifdef HAVE_THREADS - if (g_settings.video.threaded && !g_extern.system.hw_render_callback.context_type) - { - /* Can't do hardware rendering with threaded driver currently. */ - RARCH_LOG("Starting threaded video driver ...\n"); - - if (!rarch_threaded_video_init(&driver.video, &driver.video_data, - &driver.input, &driver.input_data, - driver.video, &video)) - { - RARCH_ERR("Cannot open threaded video driver ... Exiting ...\n"); - rarch_fail(1, "init_video()"); - } - } - else -#endif - driver.video_data = driver.video->init(&video, &driver.input, - &driver.input_data); - - if (!driver.video_data) - { - RARCH_ERR("Cannot open video driver ... Exiting ...\n"); - rarch_fail(1, "init_video()"); - } - - driver.video_poke = NULL; - if (driver.video->poke_interface) - driver.video->poke_interface(driver.video_data, &driver.video_poke); - - if (driver.video->viewport_info && (!custom_vp->width || - !custom_vp->height)) - { - /* Force custom viewport to have sane parameters. */ - custom_vp->width = width; - custom_vp->height = height; - driver.video->viewport_info(driver.video_data, custom_vp); - } - - if (driver.video->set_rotation) - driver.video->set_rotation(driver.video_data, - (g_settings.video.rotation + g_extern.system.rotation) % 4); - - if (driver.video->suppress_screensaver) - driver.video->suppress_screensaver(driver.video_data, - g_settings.ui.suspend_screensaver_enable); - - if (!driver.input) - init_video_input(tmp); - - rarch_main_command(RARCH_CMD_OVERLAY_DEINIT); - rarch_main_command(RARCH_CMD_OVERLAY_INIT); - - g_extern.measure_data.frame_time_samples_count = 0; - - g_extern.frame_cache.width = 4; - g_extern.frame_cache.height = 4; - g_extern.frame_cache.pitch = 8; - g_extern.frame_cache.data = &dummy_pixels; - - if (driver.video_poke && driver.video_poke->set_texture_frame) - driver.video_poke->set_texture_frame(driver.video_data, - &dummy_pixels, false, 1, 1, 1.0f); -} - /** * init_drivers: * @flags : Bitmask of drivers to initialize. @@ -619,31 +362,6 @@ void init_drivers(int flags) } } -static void uninit_video_input(void) -{ - rarch_main_command(RARCH_CMD_OVERLAY_DEINIT); - - if ( - !driver.input_data_own && - (driver.input_data != driver.video_data) && - driver.input && - driver.input->free) - driver.input->free(driver.input_data); - - if ( - !driver.video_data_own && - driver.video_data && - driver.video && - driver.video->free) - driver.video->free(driver.video_data); - - deinit_pixel_converter(); - - deinit_video_filter(); - - rarch_main_command(RARCH_CMD_SHADER_DIR_DEINIT); - video_monitor_compute_fps_statistics(); -} /** * uninit_drivers: diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 86bafa55dc..9d796ba47b 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -18,7 +18,11 @@ #include #include "video_driver.h" #include "video_thread_wrapper.h" +#include "video_pixel_converter.h" +#include "video_viewport.h" +#include "video_monitor.h" #include "../general.h" +#include "../retroarch.h" static const video_driver_t *video_drivers[] = { #ifdef HAVE_OPENGL @@ -214,3 +218,282 @@ retro_proc_address_t video_driver_get_proc_address(const char *sym) #endif return NULL; } + +static void deinit_video_filter(void) +{ + rarch_softfilter_free(g_extern.filter.filter); + free(g_extern.filter.buffer); + memset(&g_extern.filter, 0, sizeof(g_extern.filter)); +} + +static void init_video_filter(enum retro_pixel_format colfmt) +{ + unsigned width, height, pow2_x, pow2_y, maxsize; + struct retro_game_geometry *geom = NULL; + + deinit_video_filter(); + + if (!*g_settings.video.softfilter_plugin) + return; + + /* Deprecated format. Gets pre-converted. */ + if (colfmt == RETRO_PIXEL_FORMAT_0RGB1555) + colfmt = RETRO_PIXEL_FORMAT_RGB565; + + if (g_extern.system.hw_render_callback.context_type) + { + RARCH_WARN("Cannot use CPU filters when hardware rendering is used.\n"); + return; + } + + geom = (struct retro_game_geometry*)&g_extern.system.av_info.geometry; + width = geom->max_width; + height = geom->max_height; + + g_extern.filter.filter = rarch_softfilter_new( + g_settings.video.softfilter_plugin, + RARCH_SOFTFILTER_THREADS_AUTO, colfmt, width, height); + + if (!g_extern.filter.filter) + { + RARCH_ERR("Failed to load filter.\n"); + return; + } + + rarch_softfilter_get_max_output_size(g_extern.filter.filter, + &width, &height); + + pow2_x = next_pow2(width); + pow2_y = next_pow2(height); + maxsize = max(pow2_x, pow2_y); + g_extern.filter.scale = maxsize / RARCH_SCALE_BASE; + + g_extern.filter.out_rgb32 = rarch_softfilter_get_output_format( + g_extern.filter.filter) == RETRO_PIXEL_FORMAT_XRGB8888; + + g_extern.filter.out_bpp = g_extern.filter.out_rgb32 ? + sizeof(uint32_t) : sizeof(uint16_t); + + /* TODO: Aligned output. */ + g_extern.filter.buffer = malloc(width * height * g_extern.filter.out_bpp); + if (!g_extern.filter.buffer) + goto error; + + return; + +error: + RARCH_ERR("Softfilter initialization failed.\n"); + deinit_video_filter(); +} + +static void init_video_input(const input_driver_t *tmp) +{ + /* Video driver didn't provide an input driver, + * so we use configured one. */ + RARCH_LOG("Graphics driver did not initialize an input driver. Attempting to pick a suitable driver.\n"); + + if (tmp) + driver.input = tmp; + else + find_input_driver(); + + if (!driver.input) + { + /* This should never really happen as tmp (driver.input) is always + * found before this in find_driver_input(), or we have aborted + * in a similar fashion anyways. */ + rarch_fail(1, "init_video_input()"); + } + + driver.input_data = driver.input->init(); + + if (driver.input_data) + return; + + RARCH_ERR("Cannot initialize input driver. Exiting ...\n"); + rarch_fail(1, "init_video_input()"); +} + +void uninit_video_input(void) +{ + rarch_main_command(RARCH_CMD_OVERLAY_DEINIT); + + if ( + !driver.input_data_own && + (driver.input_data != driver.video_data) && + driver.input && + driver.input->free) + driver.input->free(driver.input_data); + + if ( + !driver.video_data_own && + driver.video_data && + driver.video && + driver.video->free) + driver.video->free(driver.video_data); + + deinit_pixel_converter(); + + deinit_video_filter(); + + rarch_main_command(RARCH_CMD_SHADER_DIR_DEINIT); + video_monitor_compute_fps_statistics(); +} + +void init_video(void) +{ + unsigned max_dim, scale, width, height; + rarch_viewport_t *custom_vp; + const input_driver_t *tmp = NULL; + const struct retro_game_geometry *geom = NULL; + video_info_t video = {0}; + static uint16_t dummy_pixels[32] = {0}; + + init_video_filter(g_extern.system.pix_fmt); + rarch_main_command(RARCH_CMD_SHADER_DIR_INIT); + + geom = (const struct retro_game_geometry*)&g_extern.system.av_info.geometry; + max_dim = max(geom->max_width, geom->max_height); + scale = next_pow2(max_dim) / RARCH_SCALE_BASE; + scale = max(scale, 1); + + if (g_extern.filter.filter) + scale = g_extern.filter.scale; + + /* Update core-dependent aspect ratio values. */ + video_viewport_set_square_pixel(geom->base_width, geom->base_height); + video_viewport_set_core(); + video_viewport_set_config(); + + /* Update CUSTOM viewport. */ + custom_vp = (rarch_viewport_t*)&g_extern.console.screen.viewports.custom_vp; + if (g_settings.video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM) + { + float default_aspect = aspectratio_lut[ASPECT_RATIO_CORE].value; + aspectratio_lut[ASPECT_RATIO_CUSTOM].value = + (custom_vp->width && custom_vp->height) ? + (float)custom_vp->width / custom_vp->height : default_aspect; + } + + g_extern.system.aspect_ratio = + aspectratio_lut[g_settings.video.aspect_ratio_idx].value; + + if (g_settings.video.fullscreen) + { + width = g_settings.video.fullscreen_x; + height = g_settings.video.fullscreen_y; + } + else + { + if (g_settings.video.force_aspect) + { + /* Do rounding here to simplify integer scale correctness. */ + unsigned base_width = roundf(geom->base_height * + g_extern.system.aspect_ratio); + width = roundf(base_width * g_settings.video.scale); + height = roundf(geom->base_height * g_settings.video.scale); + } + else + { + width = roundf(geom->base_width * g_settings.video.scale); + height = roundf(geom->base_height * g_settings.video.scale); + } + } + + if (width && height) + RARCH_LOG("Video @ %ux%u\n", width, height); + else + RARCH_LOG("Video @ fullscreen\n"); + + driver.display_type = RARCH_DISPLAY_NONE; + driver.video_display = 0; + driver.video_window = 0; + + if (!init_video_pixel_converter(RARCH_SCALE_BASE * scale)) + { + RARCH_ERR("Failed to initialize pixel converter.\n"); + rarch_fail(1, "init_video()"); + } + + video.width = width; + video.height = height; + video.fullscreen = g_settings.video.fullscreen; + video.vsync = g_settings.video.vsync && !g_extern.system.force_nonblock; + video.force_aspect = g_settings.video.force_aspect; +#ifdef GEKKO + video.viwidth = g_settings.video.viwidth; + video.vfilter = g_settings.video.vfilter; +#endif + video.smooth = g_settings.video.smooth; + video.input_scale = scale; + video.rgb32 = g_extern.filter.filter ? + g_extern.filter.out_rgb32 : + (g_extern.system.pix_fmt == RETRO_PIXEL_FORMAT_XRGB8888); + + tmp = (const input_driver_t*)driver.input; + /* Need to grab the "real" video driver interface on a reinit. */ + find_video_driver(); + +#ifdef HAVE_THREADS + if (g_settings.video.threaded && !g_extern.system.hw_render_callback.context_type) + { + /* Can't do hardware rendering with threaded driver currently. */ + RARCH_LOG("Starting threaded video driver ...\n"); + + if (!rarch_threaded_video_init(&driver.video, &driver.video_data, + &driver.input, &driver.input_data, + driver.video, &video)) + { + RARCH_ERR("Cannot open threaded video driver ... Exiting ...\n"); + rarch_fail(1, "init_video()"); + } + } + else +#endif + driver.video_data = driver.video->init(&video, &driver.input, + &driver.input_data); + + if (!driver.video_data) + { + RARCH_ERR("Cannot open video driver ... Exiting ...\n"); + rarch_fail(1, "init_video()"); + } + + driver.video_poke = NULL; + if (driver.video->poke_interface) + driver.video->poke_interface(driver.video_data, &driver.video_poke); + + if (driver.video->viewport_info && (!custom_vp->width || + !custom_vp->height)) + { + /* Force custom viewport to have sane parameters. */ + custom_vp->width = width; + custom_vp->height = height; + driver.video->viewport_info(driver.video_data, custom_vp); + } + + if (driver.video->set_rotation) + driver.video->set_rotation(driver.video_data, + (g_settings.video.rotation + g_extern.system.rotation) % 4); + + if (driver.video->suppress_screensaver) + driver.video->suppress_screensaver(driver.video_data, + g_settings.ui.suspend_screensaver_enable); + + if (!driver.input) + init_video_input(tmp); + + rarch_main_command(RARCH_CMD_OVERLAY_DEINIT); + rarch_main_command(RARCH_CMD_OVERLAY_INIT); + + g_extern.measure_data.frame_time_samples_count = 0; + + g_extern.frame_cache.width = 4; + g_extern.frame_cache.height = 4; + g_extern.frame_cache.pitch = 8; + g_extern.frame_cache.data = &dummy_pixels; + + if (driver.video_poke && driver.video_poke->set_texture_frame) + driver.video_poke->set_texture_frame(driver.video_data, + &dummy_pixels, false, 1, 1, 1.0f); +} diff --git a/gfx/video_driver.h b/gfx/video_driver.h index 3f936402c3..56ce0e104c 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -241,6 +241,10 @@ uintptr_t video_driver_get_current_framebuffer(void); retro_proc_address_t video_driver_get_proc_address(const char *sym); +void uninit_video_input(void); + +void init_video(void); + #ifdef __cplusplus } #endif