mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-27 23:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use configured aspect ratio to set windowed size.

Browse Source 
Fixes some cases where core aspect is used and aspect_ratio_auto isn't set.
This commit is contained in:
Themaister 2013-10-26 18:29:47 +02:00
parent cfe4df005d
commit fc5ba8f79a
3 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
driver.c
View File

@ -947,18 +947,22 @@ void init_video_input(void)
if (g_extern.filter.active) if (g_extern.filter.active)
scale = g_extern.filter.scale; scale = g_extern.filter.scale;
g_extern.system.aspect_ratio = g_settings.video.aspect_ratio; // Update core-dependent aspect ratio values.
gfx_set_square_pixel_viewport(geom->base_width, geom->base_height);
gfx_set_core_viewport();
gfx_set_config_viewport();
if (g_extern.system.aspect_ratio < 0.0f) // Update CUSTOM viewport.
rarch_viewport_t *custom_vp = &g_extern.console.screen.viewports.custom_vp;
if (g_settings.video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
{ {
if (geom->aspect_ratio > 0.0f && g_settings.video.aspect_ratio_auto) float default_aspect = aspectratio_lut[ASPECT_RATIO_CORE].value;
g_extern.system.aspect_ratio = geom->aspect_ratio; aspectratio_lut[ASPECT_RATIO_CUSTOM].value = (custom_vp->width && custom_vp->height) ?
else (float)custom_vp->width / custom_vp->height : default_aspect;
g_extern.system.aspect_ratio = (float)geom->base_width / geom->base_height; // 1:1 PAR.
RARCH_LOG("Adjusting aspect ratio to %.2f\n", g_extern.system.aspect_ratio);
} }
g_extern.system.aspect_ratio = aspectratio_lut[g_settings.video.aspect_ratio_idx].value;
unsigned width; unsigned width;
unsigned height; unsigned height;
if (g_settings.video.fullscreen) if (g_settings.video.fullscreen)
@ -970,7 +974,8 @@ void init_video_input(void)
{ {
if (g_settings.video.force_aspect) if (g_settings.video.force_aspect)
{ {
unsigned base_width = roundf(geom->base_height * g_extern.system.aspect_ratio); // Do rounding here to simplify integer scale correctness. // 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.xscale); width = roundf(base_width * g_settings.video.xscale);
height = roundf(geom->base_height * g_settings.video.yscale); height = roundf(geom->base_height * g_settings.video.yscale);
} }
@ -1034,13 +1039,17 @@ void init_video_input(void)
if (driver.video->poke_interface) if (driver.video->poke_interface)
driver.video->poke_interface(driver.video_data, &driver.video_poke); driver.video->poke_interface(driver.video_data, &driver.video_poke);
// Force custom viewport to have sane parameters.
if (!custom_vp->width || !custom_vp->height)
{
custom_vp->width = width;
custom_vp->height = height;
driver.video->viewport_info(driver.video_data, custom_vp);
}
if (driver.video->set_rotation) if (driver.video->set_rotation)
video_set_rotation_func((g_settings.video.rotation + g_extern.system.rotation) % 4); video_set_rotation_func((g_settings.video.rotation + g_extern.system.rotation) % 4);
if (driver.video_poke && driver.video_poke->set_aspect_ratio &&
g_settings.video.aspect_ratio_idx != ASPECT_RATIO_CONFIG)
driver.video_poke->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
#ifdef HAVE_X11 #ifdef HAVE_X11
if (driver.display_type == RARCH_DISPLAY_X11) if (driver.display_type == RARCH_DISPLAY_X11)
{ {

14
frontend/menu/rgui.c
View File

@ -148,20 +148,6 @@ static void *rgui_init(void)
g_settings.rgui_show_start_screen = false; g_settings.rgui_show_start_screen = false;
rgui_settings_populate_entries(rgui); rgui_settings_populate_entries(rgui);
// Make sure that custom viewport is something sane incase we use it
// before it's configured.
rarch_viewport_t *custom = &g_extern.console.screen.viewports.custom_vp;
if (driver.video_data && (!custom->width || !custom->height))
{
driver.video->viewport_info(driver.video_data, custom);
aspectratio_lut[ASPECT_RATIO_CUSTOM].value =
(float)custom->width / custom->height;
}
else if (DEFAULT_ASPECT_RATIO > 0.0f)
aspectratio_lut[ASPECT_RATIO_CUSTOM].value = DEFAULT_ASPECT_RATIO;
else
aspectratio_lut[ASPECT_RATIO_CUSTOM].value = 4.0f / 3.0f; // Something arbitrary
return rgui; return rgui;
} }

5
gfx/gfx_common.c
View File

@ -232,10 +232,9 @@ void gfx_set_square_pixel_viewport(unsigned width, unsigned height)
void gfx_set_core_viewport(void) void gfx_set_core_viewport(void)
{ {
if (!g_extern.main_is_init)
return;
const struct retro_game_geometry *geom = &g_extern.system.av_info.geometry; const struct retro_game_geometry *geom = &g_extern.system.av_info.geometry;
if (geom->base_width <= 0.0f || geom->base_height <= 0.0f)
return;
// Fallback to 1:1 pixel ratio if none provided // Fallback to 1:1 pixel ratio if none provided
if (geom->aspect_ratio > 0.0f) if (geom->aspect_ratio > 0.0f)