From a8fdfd77ce8eaa7b64ae6ef9aa6d3d2a54dfe100 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 20 May 2020 15:04:16 +0200 Subject: [PATCH] Make gamma correction 'int' type across the board --- gfx/drivers/d3d9.c | 4 ++-- retroarch.c | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c index 044bcacf32..f3ec05f997 100644 --- a/gfx/drivers/d3d9.c +++ b/gfx/drivers/d3d9.c @@ -645,8 +645,8 @@ void d3d9_make_d3dpp(void *data, #ifdef _XBOX /* TODO/FIXME - get rid of global state dependencies. */ global_t *global = global_get_ptr(); - bool gamma_enable = global ? - global->console.screen.gamma_correction : false; + int gamma_enable = global ? + global->console.screen.gamma_correction : 0; #endif bool windowed_enable = d3d9_is_windowed_enable(info->fullscreen); diff --git a/retroarch.c b/retroarch.c index 32e62c7a09..1e23d0137f 100644 --- a/retroarch.c +++ b/retroarch.c @@ -22411,13 +22411,8 @@ void video_driver_load_settings(config_file_t *conf) if (!conf) return; -#ifdef _XBOX - CONFIG_GET_BOOL_BASE(conf, global, - console.screen.gamma_correction, "gamma_correction"); -#else CONFIG_GET_INT_BASE(conf, global, console.screen.gamma_correction, "gamma_correction"); -#endif if (config_get_bool(conf, "flicker_filter_enable", &tmp_bool)) @@ -22444,13 +22439,8 @@ void video_driver_save_settings(config_file_t *conf) if (!conf) return; -#ifdef _XBOX - config_set_bool(conf, "gamma_correction", - global->console.screen.gamma_correction); -#else config_set_int(conf, "gamma_correction", global->console.screen.gamma_correction); -#endif config_set_bool(conf, "flicker_filter_enable", global->console.flickerfilter_enable); config_set_bool(conf, "soft_filter_enable",