From fe0c0d73ffaa0446e5a56286340f5cbfc945d350 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 5 Nov 2021 03:47:04 +0100 Subject: [PATCH] Move aspectratio_lut to video_driver.c --- gfx/video_driver.c | 28 ++++++++++++++++++++++++++++ retroarch.c | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 4d7766a62c..8bebf5ed1c 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -180,6 +180,34 @@ static const gfx_ctx_driver_t *gfx_ctx_gl_drivers[] = { NULL }; +struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = { + { 1.3333f, "4:3" }, + { 1.7778f, "16:9" }, + { 1.6f, "16:10" }, + { 16.0f / 15.0f, "16:15" }, + { 21.0f / 9.0f, "21:9" }, + { 1.0f, "1:1" }, + { 2.0f, "2:1" }, + { 1.5f, "3:2" }, + { 0.75f, "3:4" }, + { 4.0f, "4:1" }, + { 0.5625f, "9:16" }, + { 1.25f, "5:4" }, + { 1.2f, "6:5" }, + { 0.7777f, "7:9" }, + { 2.6666f, "8:3" }, + { 1.1428f, "8:7" }, + { 1.5833f, "19:12" }, + { 1.3571f, "19:14" }, + { 1.7647f, "30:17" }, + { 3.5555f, "32:9" }, + { 0.0f, "Config" }, + { 1.0f, "Square pixel" }, + { 1.0f, "Core provided" }, + { 0.0f, "Custom" }, + { 1.3333f, "Full" } +}; + static void *video_null_init(const video_info_t *video, input_driver_t **input, void **input_data) { diff --git a/retroarch.c b/retroarch.c index 0522eb9664..266028e13b 100644 --- a/retroarch.c +++ b/retroarch.c @@ -263,34 +263,6 @@ static struct rarch_state rarch_st; static const void *MAGIC_POINTER = (void*)(uintptr_t)0x0DEFACED; #endif -struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = { - { 1.3333f, "4:3" }, - { 1.7778f, "16:9" }, - { 1.6f, "16:10" }, - { 16.0f / 15.0f, "16:15" }, - { 21.0f / 9.0f, "21:9" }, - { 1.0f, "1:1" }, - { 2.0f, "2:1" }, - { 1.5f, "3:2" }, - { 0.75f, "3:4" }, - { 4.0f, "4:1" }, - { 0.5625f, "9:16" }, - { 1.25f, "5:4" }, - { 1.2f, "6:5" }, - { 0.7777f, "7:9" }, - { 2.6666f, "8:3" }, - { 1.1428f, "8:7" }, - { 1.5833f, "19:12" }, - { 1.3571f, "19:14" }, - { 1.7647f, "30:17" }, - { 3.5555f, "32:9" }, - { 0.0f, "Config" }, - { 1.0f, "Square pixel" }, - { 1.0f, "Core provided" }, - { 0.0f, "Custom" }, - { 1.3333f, "Full" } -}; - /* TODO/FIXME - turn these into static global variable */ #ifdef HAVE_DISCORD bool discord_is_inited = false;