mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d_calculate_rects - cleanups

Browse Source
This commit is contained in:
twinaphex 2016-01-08 03:14:49 +01:00
parent 1d07c6306e
commit 30d98d0693
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/d3d/d3d.cpp
View File

@ -292,15 +292,20 @@ static void d3d_calculate_rect(void *data,
float device_aspect = (float)*width / *height; float device_aspect = (float)*width / *height;
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
float desired_aspect = video_driver_get_aspect_ratio();
video_driver_get_size(width, height); video_driver_get_size(width, height);
gfx_ctx_translate_aspect(&device_aspect, *width, *height); gfx_ctx_translate_aspect(&device_aspect, *width, *height);
*x = 0;
*y = 0;
if (settings->video.scale_integer && !force_full) if (settings->video.scale_integer && !force_full)
{ {
struct video_viewport vp = {0}; struct video_viewport vp = {0};
video_viewport_get_scaled_integer(&vp, *width, *height, desired_aspect, d3d->keep_aspect); video_viewport_get_scaled_integer(&vp,
*width,
*height,
video_driver_get_aspect_ratio(), d3d->keep_aspect);
*x = vp.x; *x = vp.x;
*y = vp.y; *y = vp.y;
*width = vp.width; *width = vp.width;
@ -308,6 +313,9 @@ static void d3d_calculate_rect(void *data,
} }
else if (d3d->keep_aspect && !force_full) else if (d3d->keep_aspect && !force_full)
{ {
float desired_aspect = video_driver_get_aspect_ratio();
#if defined(HAVE_MENU)
if (settings->video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM) if (settings->video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
{ {
video_viewport_t *custom = video_viewport_get_custom(); video_viewport_t *custom = video_viewport_get_custom();
@ -321,21 +329,26 @@ static void d3d_calculate_rect(void *data,
} }
} }
else else
#endif
{ {
float delta; float delta;
if (fabsf(device_aspect - desired_aspect) < 0.0001f) { } if (fabsf(device_aspect - desired_aspect) < 0.0001f)
{
/* If the aspect ratios of screen and desired aspect
* ratio are sufficiently equal (floating point stuff),
* assume they are actually equal.
*/
}
else if (device_aspect > desired_aspect) else if (device_aspect > desired_aspect)
{ {
delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f; delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
*x = int(roundf(*width * (0.5f - delta))); *x = int(roundf(*width * (0.5f - delta)));
*y = 0;
*width = unsigned(roundf(2.0f * (*width) * delta)); *width = unsigned(roundf(2.0f * (*width) * delta));
} }
else else
{ {
delta = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f; delta = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
*x = 0;
*y = int(roundf(*height * (0.5f - delta))); *y = int(roundf(*height * (0.5f - delta)));
*height = unsigned(roundf(2.0f * (*height) * delta)); *height = unsigned(roundf(2.0f * (*height) * delta));
} }