mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-24 19:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-master

Browse source
This commit is contained in:
Nayla Hanegan 2023-06-23 12:58:43 -04:00
commit 6280ce45a7
No known key found for this signature in database
GPG key ID: 3075216CED0DB01D
415 changed files with 14795 additions and 9405 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Source/Core/VideoCommon/VideoConfig.h
View file

@ -52,6 +52,13 @@ enum class TextureFilteringMode : int
Linear,
};
enum class ColorCorrectionRegion : int
{
SMPTE_NTSCM,
SYSTEMJ_NTSCJ,
EBU_PAL,
};
enum class TriState : int
{
Off,
@ -72,6 +79,7 @@ enum ConfigChangeBits : u32
CONFIG_CHANGE_BIT_BBOX = (1 << 7),
CONFIG_CHANGE_BIT_ASPECT_RATIO = (1 << 8),
CONFIG_CHANGE_BIT_POST_PROCESSING_SHADER = (1 << 9),
CONFIG_CHANGE_BIT_HDR = (1 << 10),
};
// NEVER inherit from this class.
@ -101,6 +109,26 @@ struct VideoConfig final
bool bDisableCopyFilter = false;
bool bArbitraryMipmapDetection = false;
float fArbitraryMipmapDetectionThreshold = 0;
bool bHDR = false;
// Color Correction
struct
{
// Color Space Correction:
bool bCorrectColorSpace = false;
ColorCorrectionRegion game_color_space = ColorCorrectionRegion::SMPTE_NTSCM;
// Gamma Correction:
bool bCorrectGamma = false;
float fGameGamma = 2.35f;
bool bSDRDisplayGammaSRGB = true;
// Custom gamma when the display is not sRGB
float fSDRDisplayCustomGamma = 2.2f;
// HDR:
// 200 is a good default value that matches the brightness of many SDR screens
float fHDRPaperWhiteNits = 200.f;
} color_correction;
// Information
bool bShowFPS = false;
@ -215,6 +243,9 @@ struct VideoConfig final
int iShaderCompilerThreads = 0;
int iShaderPrecompilerThreads = 0;
// Loading custom drivers on Android
std::string customDriverLibraryName;
// Static config per API
// TODO: Move this out of VideoConfig
struct
@ -273,6 +304,7 @@ struct VideoConfig final
bool bSupportsDynamicVertexLoader = false;
bool bSupportsVSLinePointExpand = false;
bool bSupportsGLLayerInFS = true;
bool bSupportsHDROutput = false;
} backend_info;
// Utility