eaw/Main_MiSTer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialize has_gamma in video_init (#675)

Browse Source 
It was being initialize as a side effect of calling setGamma, but setGamma could early out if no gamma cfg was set already.
This commit is contained in:
Martin Donlon
2022-08-10 04:08:40 -07:00
committed by GitHub
parent 3192baa0f3
commit 7ab42bf375
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
video.cpp
View File

@@ -649,7 +649,7 @@ static void loadScalerCfg()
static char active_gamma_cfg[1024] = { 0 };
static char gamma_cfg[1024] = { 0 };
static char has_gamma = 0;
static char has_gamma = 0; // set in video_init
static void setGamma()
{
@@ -660,15 +660,7 @@ static void setGamma()
fileTextReader reader = {};
static char filename[1024];
if (!spi_uio_cmd_cont(UIO_SET_GAMMA))
{
DisableIO();
return;
}
has_gamma = 1;
spi8(0);
DisableIO();
if (!has_gamma) return;
snprintf(filename, sizeof(filename), GAMMA_DIR"/%s", gamma_cfg + 1);
@@ -2003,6 +1995,8 @@ void video_init()
hdmi_config_init();
video_mode_load();
has_gamma = spi_uio_cmd(UIO_SET_GAMMA);
loadGammaCfg();
loadScalerCfg();
loadShadowMaskCfg();