mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move video_viewport_custom to gfx/video_driver.c

Browse Source
This commit is contained in:
twinaphex 2017-04-29 13:10:01 +02:00
parent 6930262ec2
commit 79c7627651
4 changed files with 535 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configuration.c
View File

@ -925,6 +925,7 @@ static struct config_float_setting *populate_settings_float(settings_t *settings
static struct config_uint_setting *populate_settings_uint(settings_t *settings, int *size)
{
unsigned count = 0;
struct video_viewport *custom_vp = video_viewport_get_custom();
struct config_uint_setting *tmp = (struct config_uint_setting*)malloc((*size + 1) * sizeof(struct config_uint_setting));
SETTING_UINT("input_bind_timeout", &settings->uints.input_bind_timeout, true, input_bind_timeout, false);
@ -968,10 +969,10 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
#endif
#endif
SETTING_UINT("audio_out_rate", &settings->uints.audio_out_rate, true, out_rate, false);
SETTING_UINT("custom_viewport_width", &settings->video_viewport_custom.width, false, 0 /* TODO */, false);
SETTING_UINT("custom_viewport_height", &settings->video_viewport_custom.height, false, 0 /* TODO */, false);
SETTING_UINT("custom_viewport_x", (unsigned*)&settings->video_viewport_custom.x, false, 0 /* TODO */, false);
SETTING_UINT("custom_viewport_y", (unsigned*)&settings->video_viewport_custom.y, false, 0 /* TODO */, false);
SETTING_UINT("custom_viewport_width", &custom_vp->width, false, 0 /* TODO */, false);
SETTING_UINT("custom_viewport_height", &custom_vp->height, false, 0 /* TODO */, false);
SETTING_UINT("custom_viewport_x", (unsigned*)&custom_vp->x, false, 0 /* TODO */, false);
SETTING_UINT("custom_viewport_y", (unsigned*)&custom_vp->y, false, 0 /* TODO */, false);
SETTING_UINT("content_history_size", &settings->uints.content_history_size, true, default_content_history_size, false);
SETTING_UINT("video_hard_sync_frames", &settings->uints.video_hard_sync_frames, true, hard_sync_frames, false);
SETTING_UINT("video_frame_delay", &settings->uints.video_frame_delay, true, frame_delay, false);

2
configuration.h
View File

@ -416,8 +416,6 @@ typedef struct settings
bool modified;
video_viewport_t video_viewport_custom;
size_t rewind_buffer_size;
} settings_t;

15
gfx/video_driver.c
View File

@ -144,6 +144,8 @@ static retro_time_t video_driver_frame_time_samples[MEASURE_FRAME_TIME_SAMPLES_C
static uint64_t video_driver_frame_time_count = 0;
static uint64_t video_driver_frame_count = 0;
static video_viewport_t video_viewport_custom;
void *video_driver_data = NULL;
video_driver_t *current_video = NULL;
@ -673,12 +675,12 @@ error:
static bool video_driver_init_internal(void)
{
unsigned max_dim, scale, width, height;
video_viewport_t *custom_vp = NULL;
const input_driver_t *tmp = NULL;
const struct retro_game_geometry *geom = NULL;
rarch_system_info_t *system = NULL;
video_info_t video = {0};
static uint16_t dummy_pixels[32] = {0};
video_viewport_t *custom_vp = &video_viewport_custom;
settings_t *settings = config_get_ptr();
struct retro_system_av_info *av_info =
video_viewport_get_system_av_info();
@ -719,8 +721,6 @@ static bool video_driver_init_internal(void)
video_driver_set_viewport_config();
/* Update CUSTOM viewport. */
custom_vp = video_viewport_get_custom();
if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
{
float default_aspect = aspectratio_lut[ASPECT_RATIO_CORE].value;
@ -1460,9 +1460,7 @@ void video_driver_set_viewport_core(void)
void video_driver_reset_custom_viewport(void)
{
struct video_viewport *custom_vp = video_viewport_get_custom();
if (!custom_vp)
return;
struct video_viewport *custom_vp = &video_viewport_custom;
custom_vp->width = 0;
custom_vp->height = 0;
@ -1923,7 +1921,7 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
{
struct video_viewport *custom = video_viewport_get_custom();
struct video_viewport *custom = &video_viewport_custom;
if (custom)
{
@ -1994,8 +1992,7 @@ struct retro_system_av_info *video_viewport_get_system_av_info(void)
struct video_viewport *video_viewport_get_custom(void)
{
settings_t *settings = config_get_ptr();
return &settings->video_viewport_custom;
return &video_viewport_custom;
}
unsigned video_pixel_get_alignment(unsigned pitch)

1045
menu/menu_setting.c
View File

File diff suppressed because it is too large Load Diff