Merge pull request #3076 from FIX94/master

More GX gamma changes
This commit is contained in:
Twinaphex 2016-06-05 19:05:32 +02:00
commit f77f743403
3 changed files with 8 additions and 3 deletions

View File

@ -131,8 +131,10 @@ enum
RECORD_NULL
};
#ifdef GEKKO
#if defined(HW_RVL)
#define MAX_GAMMA_SETTING 30
#elif defined(GEKKO)
#define MAX_GAMMA_SETTING 2
#else
#define MAX_GAMMA_SETTING 1
#endif

View File

@ -864,10 +864,13 @@ static void gx_resize(void *data)
#ifdef HW_RVL
VIDEO_SetTrapFilter(global->console.softfilter_enable);
#endif
int gamma = global->console.screen.gamma_correction;
if(gamma == 0) gamma = 10; //default 1.0 gamma value
VIDEO_SetGamma(gamma);
#else
int gamma = global->console.screen.gamma_correction;
GX_SetDispCopyGamma(MAX(0,MIN(2,gamma)));
#endif
/* Ignore this for custom resolutions */
if (gx->keep_aspect && gx_mode.efbHeight >= 192)

View File

@ -1207,7 +1207,7 @@ void video_driver_menu_settings(void **list_data, void *list_info_data,
general_write_handler,
general_read_handler);
#endif
#if defined(HW_RVL) || defined(_XBOX360)
#if defined(GEKKO) || defined(_XBOX360)
CONFIG_UINT(
list, list_info,
&global->console.screen.gamma_correction,