mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-25 00:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-09-09 04:22:38 +02:00
parent 30bff1ffab
commit 06a33aada8
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gfx/video_driver.c
View File

@ -661,7 +661,7 @@ static void video_driver_filter_free(void)
video_driver_state_out_rgb32 = false; video_driver_state_out_rgb32 = false;
} }
static void video_driver_init_filter(enum retro_pixel_format colfmt) static void video_driver_init_filter(enum retro_pixel_format colfmt_int)
{ {
unsigned pow2_x, pow2_y, maxsize; unsigned pow2_x, pow2_y, maxsize;
void *buf = NULL; void *buf = NULL;
@ -669,6 +669,16 @@ static void video_driver_init_filter(enum retro_pixel_format colfmt)
struct retro_game_geometry *geom = &video_driver_av_info.geometry; struct retro_game_geometry *geom = &video_driver_av_info.geometry;
unsigned width = geom->max_width; unsigned width = geom->max_width;
unsigned height = geom->max_height; unsigned height = geom->max_height;
/* Deprecated format. Gets pre-converted. */
enum retro_pixel_format colfmt =
(colfmt_int == RETRO_PIXEL_FORMAT_0RGB1555) ?
RETRO_PIXEL_FORMAT_RGB565 : colfmt_int;
if (video_driver_is_hw_context())
{
RARCH_WARN("Cannot use CPU filters when hardware rendering is used.\n");
return;
}
video_driver_state_filter = rarch_softfilter_new( video_driver_state_filter = rarch_softfilter_new(
settings->paths.path_softfilter_plugin, settings->paths.path_softfilter_plugin,
@ -895,21 +905,7 @@ static bool video_driver_init_internal(bool *video_is_threaded)
struct retro_game_geometry *geom = &video_driver_av_info.geometry; struct retro_game_geometry *geom = &video_driver_av_info.geometry;
if (!string_is_empty(settings->paths.path_softfilter_plugin)) if (!string_is_empty(settings->paths.path_softfilter_plugin))
{ video_driver_init_filter(video_driver_pix_fmt);
if (video_driver_is_hw_context())
{
RARCH_WARN("Cannot use CPU filters when hardware rendering is used.\n");
}
else
{
/* Deprecated format. Gets pre-converted. */
enum retro_pixel_format colfmt =
(video_driver_pix_fmt == RETRO_PIXEL_FORMAT_0RGB1555) ?
RETRO_PIXEL_FORMAT_RGB565 : video_driver_pix_fmt;
video_driver_init_filter(colfmt);
}
}
command_event(CMD_EVENT_SHADER_DIR_INIT, NULL); command_event(CMD_EVENT_SHADER_DIR_INIT, NULL);