mirror of
https://github.com/optiscaler/OptiScaler.git
synced 2026-09-26 15:26:17 +00:00
Added saving ini settings as hex
This commit is contained in:
cdozdil
@@ -508,11 +508,14 @@ std::string GetBoolValue(std::optional<bool> value)
|
||||
return value.value() ? "true" : "false";
|
||||
}
|
||||
|
||||
std::string GetIntValue(std::optional<int> value)
|
||||
std::string GetIntValue(std::optional<int> value, bool getHex = false)
|
||||
{
|
||||
if (!value.has_value())
|
||||
return "auto";
|
||||
|
||||
if(getHex)
|
||||
return std::format("{:#x}", value.value());
|
||||
|
||||
return std::to_string(value.value());
|
||||
}
|
||||
|
||||
@@ -678,10 +681,12 @@ bool Config::SaveIni()
|
||||
{
|
||||
ini.SetValue("Menu", "Scale", GetFloatValue(Instance()->MenuScale.value_for_config()).c_str());
|
||||
ini.SetValue("Menu", "OverlayMenu", GetBoolValue(Instance()->OverlayMenu.value_for_config()).c_str());
|
||||
ini.SetValue("Menu", "ShortcutKey", GetIntValue(Instance()->ShortcutKey.value_for_config()).c_str());
|
||||
ini.SetValue("Menu", "ShortcutKey", GetIntValue(Instance()->ShortcutKey.value_for_config(), true).c_str());
|
||||
ini.SetValue("Menu", "ExtendedLimits", GetBoolValue(Instance()->ExtendedLimits.value_for_config()).c_str());
|
||||
ini.SetValue("Menu", "ShowFps", GetBoolValue(Instance()->ShowFps.value_for_config()).c_str());
|
||||
ini.SetValue("Menu", "UseHQFont", GetBoolValue(Instance()->UseHQFont.value_for_config()).c_str());
|
||||
ini.SetValue("Menu", "FpsShortcutKey", GetIntValue(Instance()->FpsShortcutKey.value_for_config(), true).c_str());
|
||||
ini.SetValue("Menu", "FpsCycleShortcutKey", GetIntValue(Instance()->FpsCycleShortcutKey.value_for_config(), true).c_str());
|
||||
ini.SetValue("Menu", "FpsOverlayPos", GetIntValue(Instance()->FpsOverlayPos.value_for_config()).c_str());
|
||||
ini.SetValue("Menu", "FpsOverlayType", GetIntValue(Instance()->FpsOverlayType.value_for_config()).c_str());
|
||||
ini.SetValue("Menu", "FpsOverlayHorizontal", GetBoolValue(Instance()->FpsOverlayHorizontal.value_for_config()).c_str());
|
||||
|
||||
+317
-318
@@ -7,401 +7,400 @@
|
||||
|
||||
enum HasDefaultValue
|
||||
{
|
||||
WithDefault,
|
||||
WithDefault,
|
||||
NoDefault,
|
||||
SoftDefault // Change always gets saved to the config
|
||||
SoftDefault // Change always gets saved to the config
|
||||
};
|
||||
|
||||
template <class T, HasDefaultValue defaultState = WithDefault>
|
||||
class CustomOptional : public std::optional<T> {
|
||||
private:
|
||||
T _defaultValue;
|
||||
std::optional<T> _configIni;
|
||||
bool _volatile;
|
||||
T _defaultValue;
|
||||
std::optional<T> _configIni;
|
||||
bool _volatile;
|
||||
|
||||
public:
|
||||
CustomOptional(T defaultValue) requires (defaultState != NoDefault)
|
||||
: std::optional<T>(), _defaultValue(std::move(defaultValue)), _configIni(std::nullopt), _volatile(false) {}
|
||||
CustomOptional(T defaultValue) requires (defaultState != NoDefault)
|
||||
: std::optional<T>(), _defaultValue(std::move(defaultValue)), _configIni(std::nullopt), _volatile(false) {}
|
||||
|
||||
CustomOptional() requires (defaultState == NoDefault)
|
||||
: std::optional<T>(), _defaultValue(T{}), _configIni(std::nullopt), _volatile(false) {}
|
||||
CustomOptional() requires (defaultState == NoDefault)
|
||||
: std::optional<T>(), _defaultValue(T{}), _configIni(std::nullopt), _volatile(false) {}
|
||||
|
||||
// Prevents a change from being saved to ini
|
||||
constexpr void set_volatile_value(const T& value) {
|
||||
if (!_volatile) { // make sure the previously set value is saved
|
||||
if (this->has_value())
|
||||
_configIni = this->value();
|
||||
else
|
||||
_configIni = std::nullopt;
|
||||
}
|
||||
_volatile = true;
|
||||
std::optional<T>::operator=(value);
|
||||
}
|
||||
|
||||
// Use this when first setting a CustomOptional
|
||||
constexpr void set_from_config(const std::optional<T>& opt) {
|
||||
if (!this->has_value()) {
|
||||
_configIni = opt;
|
||||
std::optional<T>::operator=(opt);
|
||||
}
|
||||
}
|
||||
// Prevents a change from being saved to ini
|
||||
constexpr void set_volatile_value(const T& value) {
|
||||
if (!_volatile) { // make sure the previously set value is saved
|
||||
if (this->has_value())
|
||||
_configIni = this->value();
|
||||
else
|
||||
_configIni = std::nullopt;
|
||||
}
|
||||
_volatile = true;
|
||||
std::optional<T>::operator=(value);
|
||||
}
|
||||
|
||||
constexpr CustomOptional& operator=(const T& value) {
|
||||
_volatile = false;
|
||||
std::optional<T>::operator=(value);
|
||||
return *this;
|
||||
}
|
||||
// Use this when first setting a CustomOptional
|
||||
constexpr void set_from_config(const std::optional<T>& opt) {
|
||||
if (!this->has_value()) {
|
||||
_configIni = opt;
|
||||
std::optional<T>::operator=(opt);
|
||||
}
|
||||
}
|
||||
|
||||
constexpr CustomOptional& operator=(T&& value) {
|
||||
_volatile = false;
|
||||
std::optional<T>::operator=(std::move(value));
|
||||
return *this;
|
||||
}
|
||||
constexpr CustomOptional& operator=(const T& value) {
|
||||
_volatile = false;
|
||||
std::optional<T>::operator=(value);
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr CustomOptional& operator=(const std::optional<T>& opt) {
|
||||
_volatile = false;
|
||||
std::optional<T>::operator=(opt);
|
||||
return *this;
|
||||
}
|
||||
constexpr CustomOptional& operator=(T&& value) {
|
||||
_volatile = false;
|
||||
std::optional<T>::operator=(std::move(value));
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr CustomOptional& operator=(std::optional<T>&& opt) {
|
||||
_volatile = false;
|
||||
std::optional<T>::operator=(std::move(opt));
|
||||
return *this;
|
||||
}
|
||||
constexpr CustomOptional& operator=(const std::optional<T>& opt) {
|
||||
_volatile = false;
|
||||
std::optional<T>::operator=(opt);
|
||||
return *this;
|
||||
}
|
||||
|
||||
// Needed for string literals for some reason
|
||||
constexpr CustomOptional& operator=(const char* value) requires std::same_as<T, std::string> {
|
||||
_volatile = false;
|
||||
std::optional<T>::operator=(T(value));
|
||||
return *this;
|
||||
}
|
||||
constexpr CustomOptional& operator=(std::optional<T>&& opt) {
|
||||
_volatile = false;
|
||||
std::optional<T>::operator=(std::move(opt));
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr T value_or_default() const& requires (defaultState != NoDefault) {
|
||||
return this->has_value() ? this->value() : _defaultValue;
|
||||
}
|
||||
// Needed for string literals for some reason
|
||||
constexpr CustomOptional& operator=(const char* value) requires std::same_as<T, std::string> {
|
||||
_volatile = false;
|
||||
std::optional<T>::operator=(T(value));
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr T value_or_default()&& requires (defaultState != NoDefault) {
|
||||
return this->has_value() ? std::move(this->value()) : std::move(_defaultValue);
|
||||
}
|
||||
constexpr T value_or_default() const& requires (defaultState != NoDefault) {
|
||||
return this->has_value() ? this->value() : _defaultValue;
|
||||
}
|
||||
|
||||
constexpr std::optional<T> value_for_config() requires (defaultState == WithDefault) {
|
||||
if (_volatile) {
|
||||
if (_configIni != _defaultValue)
|
||||
return _configIni;
|
||||
constexpr T value_or_default() && requires (defaultState != NoDefault) {
|
||||
return this->has_value() ? std::move(this->value()) : std::move(_defaultValue);
|
||||
}
|
||||
|
||||
return std::nullopt;
|
||||
}
|
||||
constexpr std::optional<T> value_for_config() requires (defaultState == WithDefault) {
|
||||
if (_volatile) {
|
||||
if (_configIni != _defaultValue)
|
||||
return _configIni;
|
||||
|
||||
if (!this->has_value() || *this == _defaultValue)
|
||||
return std::nullopt;
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
return this->value();
|
||||
}
|
||||
if (!this->has_value() || *this == _defaultValue)
|
||||
return std::nullopt;
|
||||
|
||||
constexpr std::optional<T> value_for_config() requires (defaultState != WithDefault) {
|
||||
if (_volatile)
|
||||
return _configIni;
|
||||
return this->value();
|
||||
}
|
||||
|
||||
if (this->has_value())
|
||||
return this->value();
|
||||
constexpr std::optional<T> value_for_config() requires (defaultState != WithDefault) {
|
||||
if (_volatile)
|
||||
return _configIni;
|
||||
|
||||
return std::nullopt;
|
||||
}
|
||||
if (this->has_value())
|
||||
return this->value();
|
||||
|
||||
constexpr T value_for_config_or(T other) {
|
||||
auto option = value_for_config();
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
if (option.has_value())
|
||||
return option.value();
|
||||
else
|
||||
return other;
|
||||
}
|
||||
constexpr T value_for_config_or(T other) {
|
||||
auto option = value_for_config();
|
||||
|
||||
if (option.has_value())
|
||||
return option.value();
|
||||
else
|
||||
return other;
|
||||
}
|
||||
};
|
||||
|
||||
class Config
|
||||
{
|
||||
public:
|
||||
Config();
|
||||
Config();
|
||||
|
||||
// Init flags
|
||||
CustomOptional<bool, NoDefault> DepthInverted;
|
||||
CustomOptional<bool, NoDefault> AutoExposure;
|
||||
CustomOptional<bool, NoDefault> HDR;
|
||||
CustomOptional<bool, NoDefault> JitterCancellation;
|
||||
CustomOptional<bool, NoDefault> DisplayResolution;
|
||||
CustomOptional<bool, NoDefault> DisableReactiveMask;
|
||||
CustomOptional<float> DlssReactiveMaskBias{ 0.45f };
|
||||
// Init flags
|
||||
CustomOptional<bool, NoDefault> DepthInverted;
|
||||
CustomOptional<bool, NoDefault> AutoExposure;
|
||||
CustomOptional<bool, NoDefault> HDR;
|
||||
CustomOptional<bool, NoDefault> JitterCancellation;
|
||||
CustomOptional<bool, NoDefault> DisplayResolution;
|
||||
CustomOptional<bool, NoDefault> DisableReactiveMask;
|
||||
CustomOptional<float> DlssReactiveMaskBias{ 0.45f };
|
||||
|
||||
// Logging
|
||||
CustomOptional<bool> LogToFile{ false };
|
||||
CustomOptional<bool> LogToConsole{ false };
|
||||
CustomOptional<bool> LogToNGX{ false };
|
||||
CustomOptional<bool> OpenConsole{ false };
|
||||
CustomOptional<bool> DebugWait{ false }; // not in ini
|
||||
CustomOptional<int> LogLevel{ 2 };
|
||||
CustomOptional<std::wstring> LogFileName{ L"OptiScaler.log" };
|
||||
CustomOptional<bool> LogSingleFile{ true };
|
||||
CustomOptional<bool> LogAsync{ false };
|
||||
CustomOptional<int> LogAsyncThreads{ 4 };
|
||||
// Logging
|
||||
CustomOptional<bool> LogToFile{ false };
|
||||
CustomOptional<bool> LogToConsole{ false };
|
||||
CustomOptional<bool> LogToNGX{ false };
|
||||
CustomOptional<bool> OpenConsole{ false };
|
||||
CustomOptional<bool> DebugWait{ false }; // not in ini
|
||||
CustomOptional<int> LogLevel{ 2 };
|
||||
CustomOptional<std::wstring> LogFileName{ L"OptiScaler.log" };
|
||||
CustomOptional<bool> LogSingleFile{ true };
|
||||
CustomOptional<bool> LogAsync{ false };
|
||||
CustomOptional<int> LogAsyncThreads{ 4 };
|
||||
|
||||
// XeSS
|
||||
CustomOptional<bool> BuildPipelines{ true };
|
||||
CustomOptional<int32_t> NetworkModel{ 0 };
|
||||
CustomOptional<bool> CreateHeaps{ true };
|
||||
CustomOptional<std::wstring, NoDefault> XeSSLibrary;
|
||||
CustomOptional<std::wstring, NoDefault> XeSSDx11Library;
|
||||
// XeSS
|
||||
CustomOptional<bool> BuildPipelines{ true };
|
||||
CustomOptional<int32_t> NetworkModel{ 0 };
|
||||
CustomOptional<bool> CreateHeaps{ true };
|
||||
CustomOptional<std::wstring, NoDefault> XeSSLibrary;
|
||||
CustomOptional<std::wstring, NoDefault> XeSSDx11Library;
|
||||
|
||||
// DLSS
|
||||
CustomOptional<bool> DLSSEnabled{ true };
|
||||
CustomOptional<std::wstring, NoDefault> NvngxPath;
|
||||
CustomOptional<std::wstring, NoDefault> NVNGX_DLSS_Library;
|
||||
CustomOptional<std::wstring, NoDefault> DLSSFeaturePath;
|
||||
CustomOptional<bool> RenderPresetOverride{ false };
|
||||
CustomOptional<uint32_t> RenderPresetForAll{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetDLAA{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetUltraQuality{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetQuality{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetBalanced{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetPerformance{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetUltraPerformance{ 0 };
|
||||
// DLSS
|
||||
CustomOptional<bool> DLSSEnabled{ true };
|
||||
CustomOptional<std::wstring, NoDefault> NvngxPath;
|
||||
CustomOptional<std::wstring, NoDefault> NVNGX_DLSS_Library;
|
||||
CustomOptional<std::wstring, NoDefault> DLSSFeaturePath;
|
||||
CustomOptional<bool> RenderPresetOverride{ false };
|
||||
CustomOptional<uint32_t> RenderPresetForAll{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetDLAA{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetUltraQuality{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetQuality{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetBalanced{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetPerformance{ 0 };
|
||||
CustomOptional<uint32_t> RenderPresetUltraPerformance{ 0 };
|
||||
|
||||
// Nukems
|
||||
CustomOptional<bool> MakeDepthCopy{ false };
|
||||
// Nukems
|
||||
CustomOptional<bool> MakeDepthCopy{ false };
|
||||
|
||||
// CAS
|
||||
CustomOptional<bool> RcasEnabled{ false };
|
||||
CustomOptional<bool> MotionSharpnessEnabled{ false };
|
||||
CustomOptional<bool> MotionSharpnessDebug{ false };
|
||||
CustomOptional<float> MotionSharpness{ 0.4f };
|
||||
CustomOptional<float> MotionThreshold{ 0.0f };
|
||||
CustomOptional<float> MotionScaleLimit{ 10.0f };
|
||||
// CAS
|
||||
CustomOptional<bool> RcasEnabled{ false };
|
||||
CustomOptional<bool> MotionSharpnessEnabled{ false };
|
||||
CustomOptional<bool> MotionSharpnessDebug{ false };
|
||||
CustomOptional<float> MotionSharpness{ 0.4f };
|
||||
CustomOptional<float> MotionThreshold{ 0.0f };
|
||||
CustomOptional<float> MotionScaleLimit{ 10.0f };
|
||||
|
||||
// Sharpness
|
||||
CustomOptional<bool> OverrideSharpness{ false };
|
||||
CustomOptional<float> Sharpness{ 0.3f };
|
||||
CustomOptional<bool> ContrastEnabled{ false };
|
||||
CustomOptional<float> Contrast{ 0.0f };
|
||||
// Sharpness
|
||||
CustomOptional<bool> OverrideSharpness{ false };
|
||||
CustomOptional<float> Sharpness{ 0.3f };
|
||||
CustomOptional<bool> ContrastEnabled{ false };
|
||||
CustomOptional<float> Contrast{ 0.0f };
|
||||
|
||||
// Menu
|
||||
CustomOptional<float> MenuScale{ 1.0f };
|
||||
CustomOptional<bool> OverlayMenu{ true };
|
||||
CustomOptional<int> ShortcutKey{ VK_INSERT };
|
||||
CustomOptional<bool> ExtendedLimits{ false };
|
||||
CustomOptional<bool> ShowFps{ false };
|
||||
CustomOptional<int> FpsOverlayPos{ 0 }; // 0 Top Left, 1 Top Right, 2 Bottom Left, 3 Bottom Right
|
||||
CustomOptional<int> FpsOverlayType{ 0 }; // 0 Only FPS, 1 +Frame Time, 2 +Upscaler Time, 3 +Frame Time Graph, 4 +Upscaler Time Graph
|
||||
CustomOptional<int> FpsShortcutKey{ VK_PRIOR };
|
||||
CustomOptional<int> FpsCycleShortcutKey{ VK_NEXT };
|
||||
CustomOptional<bool> FpsOverlayHorizontal{ false };
|
||||
CustomOptional<float> FpsOverlayAlpha{ 0.4f };
|
||||
CustomOptional<bool> UseHQFont{ true };
|
||||
// Menu
|
||||
CustomOptional<float> MenuScale{ 1.0f };
|
||||
CustomOptional<bool> OverlayMenu{ true };
|
||||
CustomOptional<int> ShortcutKey{ VK_INSERT };
|
||||
CustomOptional<bool> ExtendedLimits{ false };
|
||||
CustomOptional<bool> ShowFps{ false };
|
||||
CustomOptional<int> FpsOverlayPos{ 0 }; // 0 Top Left, 1 Top Right, 2 Bottom Left, 3 Bottom Right
|
||||
CustomOptional<int> FpsOverlayType{ 0 }; // 0 Only FPS, 1 +Frame Time, 2 +Upscaler Time, 3 +Frame Time Graph, 4 +Upscaler Time Graph
|
||||
CustomOptional<int> FpsShortcutKey{ VK_PRIOR };
|
||||
CustomOptional<int> FpsCycleShortcutKey{ VK_NEXT };
|
||||
CustomOptional<bool> FpsOverlayHorizontal{ false };
|
||||
CustomOptional<float> FpsOverlayAlpha{ 0.4f };
|
||||
CustomOptional<bool> UseHQFont{ true };
|
||||
|
||||
// Hooks
|
||||
CustomOptional<bool> HookOriginalNvngxOnly{ false };
|
||||
// Hooks
|
||||
CustomOptional<bool> HookOriginalNvngxOnly{ false };
|
||||
|
||||
// Upscale Ratio Override
|
||||
CustomOptional<bool> UpscaleRatioOverrideEnabled{ false };
|
||||
CustomOptional<float> UpscaleRatioOverrideValue{ 1.3f };
|
||||
// Upscale Ratio Override
|
||||
CustomOptional<bool> UpscaleRatioOverrideEnabled{ false };
|
||||
CustomOptional<float> UpscaleRatioOverrideValue{ 1.3f };
|
||||
|
||||
// DRS
|
||||
CustomOptional<bool> DrsMinOverrideEnabled{ false };
|
||||
CustomOptional<bool> DrsMaxOverrideEnabled{ false };
|
||||
// DRS
|
||||
CustomOptional<bool> DrsMinOverrideEnabled{ false };
|
||||
CustomOptional<bool> DrsMaxOverrideEnabled{ false };
|
||||
|
||||
// Quality Overrides
|
||||
CustomOptional<bool> QualityRatioOverrideEnabled{ false };
|
||||
CustomOptional<float> QualityRatio_DLAA{ 1.0f };
|
||||
CustomOptional<float> QualityRatio_UltraQuality{ 1.3f };
|
||||
CustomOptional<float> QualityRatio_Quality{ 1.5f };
|
||||
CustomOptional<float> QualityRatio_Balanced{ 1.7f };
|
||||
CustomOptional<float> QualityRatio_Performance{ 2.0f };
|
||||
CustomOptional<float> QualityRatio_UltraPerformance{ 3.0f };
|
||||
// Quality Overrides
|
||||
CustomOptional<bool> QualityRatioOverrideEnabled{ false };
|
||||
CustomOptional<float> QualityRatio_DLAA{ 1.0f };
|
||||
CustomOptional<float> QualityRatio_UltraQuality{ 1.3f };
|
||||
CustomOptional<float> QualityRatio_Quality{ 1.5f };
|
||||
CustomOptional<float> QualityRatio_Balanced{ 1.7f };
|
||||
CustomOptional<float> QualityRatio_Performance{ 2.0f };
|
||||
CustomOptional<float> QualityRatio_UltraPerformance{ 3.0f };
|
||||
|
||||
// Hotfixes
|
||||
CustomOptional<float, NoDefault> MipmapBiasOverride; // disabled by default
|
||||
CustomOptional<bool> MipmapBiasFixedOverride{ false };
|
||||
CustomOptional<bool> MipmapBiasScaleOverride{ false };
|
||||
CustomOptional<bool> MipmapBiasOverrideAll{ false };
|
||||
CustomOptional<int, NoDefault> AnisotropyOverride; // disabled by default
|
||||
CustomOptional<bool> OverrideShaderSampler{ false };
|
||||
CustomOptional<int, NoDefault> RoundInternalResolution; // disabled by default
|
||||
// Hotfixes
|
||||
CustomOptional<float, NoDefault> MipmapBiasOverride; // disabled by default
|
||||
CustomOptional<bool> MipmapBiasFixedOverride{ false };
|
||||
CustomOptional<bool> MipmapBiasScaleOverride{ false };
|
||||
CustomOptional<bool> MipmapBiasOverrideAll{ false };
|
||||
CustomOptional<int, NoDefault> AnisotropyOverride; // disabled by default
|
||||
CustomOptional<bool> OverrideShaderSampler{ false };
|
||||
CustomOptional<int, NoDefault> RoundInternalResolution; // disabled by default
|
||||
|
||||
CustomOptional<bool> RestoreComputeSignature{ false };
|
||||
CustomOptional<bool> RestoreGraphicSignature{ false };
|
||||
CustomOptional<int, NoDefault> SkipFirstFrames; // disabled by default
|
||||
CustomOptional<bool> RestoreComputeSignature{ false };
|
||||
CustomOptional<bool> RestoreGraphicSignature{ false };
|
||||
CustomOptional<int, NoDefault> SkipFirstFrames; // disabled by default
|
||||
|
||||
CustomOptional<bool> UsePrecompiledShaders{ true };
|
||||
CustomOptional<bool> UsePrecompiledShaders{ true };
|
||||
|
||||
CustomOptional<bool> UseGenericAppIdWithDlss{ false };
|
||||
CustomOptional<bool> PreferDedicatedGpu{ false };
|
||||
CustomOptional<bool> PreferFirstDedicatedGpu{ false };
|
||||
CustomOptional<bool> UseGenericAppIdWithDlss{ false };
|
||||
CustomOptional<bool> PreferDedicatedGpu{ false };
|
||||
CustomOptional<bool> PreferFirstDedicatedGpu{ false };
|
||||
|
||||
CustomOptional<int32_t, NoDefault> ColorResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> MVResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> DepthResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> ExposureResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> MaskResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> OutputResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> ColorResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> MVResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> DepthResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> ExposureResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> MaskResourceBarrier; // disabled by default
|
||||
CustomOptional<int32_t, NoDefault> OutputResourceBarrier; // disabled by default
|
||||
|
||||
// Upscalers
|
||||
CustomOptional<std::string, SoftDefault> Dx11Upscaler{ "fsr22" };
|
||||
CustomOptional<std::string, SoftDefault> Dx12Upscaler{ "xess" };
|
||||
CustomOptional<std::string, SoftDefault> VulkanUpscaler{ "fsr21" };
|
||||
// Upscalers
|
||||
CustomOptional<std::string, SoftDefault> Dx11Upscaler{ "fsr22" };
|
||||
CustomOptional<std::string, SoftDefault> Dx12Upscaler{ "xess" };
|
||||
CustomOptional<std::string, SoftDefault> VulkanUpscaler{ "fsr21" };
|
||||
|
||||
// Output Scaling
|
||||
CustomOptional<bool> OutputScalingEnabled{ false };
|
||||
CustomOptional<float> OutputScalingMultiplier{ 1.5f };
|
||||
CustomOptional<bool> OutputScalingUseFsr{ true };
|
||||
CustomOptional<uint32_t> OutputScalingDownscaler{ 0 }; // 0 = Bicubic | 1 = Lanczos | 2 = Catmull-Rom | 3 = MAGC
|
||||
// Output Scaling
|
||||
CustomOptional<bool> OutputScalingEnabled{ false };
|
||||
CustomOptional<float> OutputScalingMultiplier{ 1.5f };
|
||||
CustomOptional<bool> OutputScalingUseFsr{ true };
|
||||
CustomOptional<uint32_t> OutputScalingDownscaler{ 0 }; // 0 = Bicubic | 1 = Lanczos | 2 = Catmull-Rom | 3 = MAGC
|
||||
|
||||
// FSR
|
||||
CustomOptional<bool> FsrDebugView{ false };
|
||||
CustomOptional<int> Fsr3xIndex{ 0 };
|
||||
CustomOptional<bool> FsrUseMaskForTransparency{ true };
|
||||
CustomOptional<float> FsrVelocity{ 1.0f };
|
||||
CustomOptional<bool> Fsr4Update{ false };
|
||||
CustomOptional<bool> FsrNonLinearSRGB{ false };
|
||||
CustomOptional<bool> FsrNonLinearPQ{ false };
|
||||
CustomOptional<bool> FsrAgilitySDKUpgrade{ false };
|
||||
// FSR
|
||||
CustomOptional<bool> FsrDebugView{ false };
|
||||
CustomOptional<int> Fsr3xIndex{ 0 };
|
||||
CustomOptional<bool> FsrUseMaskForTransparency{ true };
|
||||
CustomOptional<float> FsrVelocity{ 1.0f };
|
||||
CustomOptional<bool> Fsr4Update{ false };
|
||||
CustomOptional<bool> FsrNonLinearSRGB{ false };
|
||||
CustomOptional<bool> FsrNonLinearPQ{ false };
|
||||
CustomOptional<bool> FsrAgilitySDKUpgrade{ false };
|
||||
|
||||
// FSR Common
|
||||
CustomOptional<float> FsrVerticalFov{ 60.0f };
|
||||
CustomOptional<float> FsrHorizontalFov{ 0.0f }; // off by default
|
||||
CustomOptional<float> FsrCameraNear{ 0.1f };
|
||||
CustomOptional<float> FsrCameraFar{ 100000.0f };
|
||||
CustomOptional<bool> FsrUseFsrInputValues{ true };
|
||||
// FSR Common
|
||||
CustomOptional<float> FsrVerticalFov{ 60.0f };
|
||||
CustomOptional<float> FsrHorizontalFov{ 0.0f }; // off by default
|
||||
CustomOptional<float> FsrCameraNear{ 0.1f };
|
||||
CustomOptional<float> FsrCameraFar{ 100000.0f };
|
||||
CustomOptional<bool> FsrUseFsrInputValues{ true };
|
||||
|
||||
CustomOptional<std::wstring, NoDefault> FfxDx12Path;
|
||||
CustomOptional<std::wstring, NoDefault> FfxVkPath;
|
||||
CustomOptional<std::wstring, NoDefault> FfxDx12Path;
|
||||
CustomOptional<std::wstring, NoDefault> FfxVkPath;
|
||||
|
||||
// dx11wdx12
|
||||
// Valid values are;
|
||||
// 0 - No syncing(fastest, most prone to errors)
|
||||
// 1 - Fence
|
||||
// 2 - Fences + Flush
|
||||
// 3 - Fences + Event
|
||||
// 4 - Fences + Flush + Event
|
||||
// 5 - Query Only
|
||||
CustomOptional<int> TextureSyncMethod{ 1 };
|
||||
CustomOptional<int> CopyBackSyncMethod{ 5 };
|
||||
CustomOptional<bool> Dx11DelayedInit{ false };
|
||||
CustomOptional<bool> SyncAfterDx12{ true };
|
||||
CustomOptional<bool> DontUseNTShared{ false };
|
||||
// dx11wdx12
|
||||
// Valid values are;
|
||||
// 0 - No syncing(fastest, most prone to errors)
|
||||
// 1 - Fence
|
||||
// 2 - Fences + Flush
|
||||
// 3 - Fences + Event
|
||||
// 4 - Fences + Flush + Event
|
||||
// 5 - Query Only
|
||||
CustomOptional<int> TextureSyncMethod{ 1 };
|
||||
CustomOptional<int> CopyBackSyncMethod{ 5 };
|
||||
CustomOptional<bool> Dx11DelayedInit{ false };
|
||||
CustomOptional<bool> SyncAfterDx12{ true };
|
||||
CustomOptional<bool> DontUseNTShared{ false };
|
||||
|
||||
// NVAPI Override
|
||||
CustomOptional<bool> OverrideNvapiDll{ false };
|
||||
CustomOptional<std::wstring, NoDefault> NvapiDllPath;
|
||||
// NVAPI Override
|
||||
CustomOptional<bool> OverrideNvapiDll{ false };
|
||||
CustomOptional<std::wstring, NoDefault> NvapiDllPath;
|
||||
|
||||
// Spoofing
|
||||
CustomOptional<bool> DxgiSpoofing{ true };
|
||||
CustomOptional<std::string, NoDefault> DxgiBlacklist; // disabled by default
|
||||
CustomOptional<int, NoDefault> DxgiVRAM; // disabled by default
|
||||
CustomOptional<bool> VulkanSpoofing{ false };
|
||||
CustomOptional<bool> VulkanExtensionSpoofing{ false };
|
||||
CustomOptional<std::wstring> SpoofedGPUName{ L"NVIDIA GeForce RTX 4090" };
|
||||
CustomOptional<int, NoDefault> VulkanVRAM; // disabled by default
|
||||
CustomOptional<bool> SpoofHAGS{ false };
|
||||
CustomOptional<bool> SpoofFeatureLevel{ false };
|
||||
// Spoofing
|
||||
CustomOptional<bool> DxgiSpoofing{ true };
|
||||
CustomOptional<std::string, NoDefault> DxgiBlacklist; // disabled by default
|
||||
CustomOptional<int, NoDefault> DxgiVRAM; // disabled by default
|
||||
CustomOptional<bool> VulkanSpoofing{ false };
|
||||
CustomOptional<bool> VulkanExtensionSpoofing{ false };
|
||||
CustomOptional<int, NoDefault> VulkanVRAM; // disabled by default
|
||||
CustomOptional<bool> SpoofHAGS{ false };
|
||||
CustomOptional<bool> SpoofFeatureLevel{ false };
|
||||
CustomOptional<uint32_t> SpoofedVendorId{ 0x10de };
|
||||
CustomOptional<uint32_t> SpoofedDeviceId{ 0x2684 };
|
||||
CustomOptional<uint32_t, NoDefault> TargetVendorId;
|
||||
CustomOptional<uint32_t, NoDefault> TargetDeviceId;
|
||||
CustomOptional<std::wstring> SpoofedGPUName{ L"NVIDIA GeForce RTX 4090" };
|
||||
|
||||
// Plugins
|
||||
CustomOptional<std::wstring> PluginPath{ L"plugins" };
|
||||
CustomOptional<bool> LoadSpecialK{ false };
|
||||
CustomOptional<bool> LoadReShade{ false };
|
||||
// Plugins
|
||||
CustomOptional<std::wstring> PluginPath{ L"plugins" };
|
||||
CustomOptional<bool> LoadSpecialK{ false };
|
||||
CustomOptional<bool> LoadReShade{ false };
|
||||
CustomOptional<bool> LoadAsiPlugins{ true };
|
||||
|
||||
// Frame Generation
|
||||
CustomOptional<FGType> FGType{ FGType::NoFG };
|
||||
// Frame Generation
|
||||
CustomOptional<FGType> FGType{ FGType::NoFG };
|
||||
|
||||
// OptiFG
|
||||
CustomOptional<bool> FGEnabled{ false };
|
||||
CustomOptional<bool> FGHighPriority{ true };
|
||||
CustomOptional<bool> FGDebugView{ false };
|
||||
CustomOptional<bool> FGAsync{ false };
|
||||
CustomOptional<bool> FGHUDFix{ false };
|
||||
CustomOptional<bool> FGHUDFixExtended{ false };
|
||||
CustomOptional<bool> FGImmediateCapture{ false };
|
||||
CustomOptional<int> FGHUDLimit{ 1 };
|
||||
CustomOptional<int, NoDefault> FGRectLeft;
|
||||
CustomOptional<int, NoDefault> FGRectTop;
|
||||
CustomOptional<int, NoDefault> FGRectWidth;
|
||||
CustomOptional<int, NoDefault> FGRectHeight;
|
||||
CustomOptional<bool> FGDisableOverlays{ false };
|
||||
CustomOptional<bool> FGAlwaysTrackHeaps{ false };
|
||||
CustomOptional<bool> FGMakeDepthCopy{ true };
|
||||
CustomOptional<bool> FGEnableDepthScale{ false };
|
||||
CustomOptional<float> FGDepthScaleMax{ 10000.0f };
|
||||
CustomOptional<bool> FGMakeMVCopy{ true };
|
||||
CustomOptional<bool> FGHudFixCloseAfterCallback{ true };
|
||||
CustomOptional<bool> FGUseMutexForSwaphain{ true };
|
||||
CustomOptional<bool> FGFramePacingTuning{ true };
|
||||
CustomOptional<float> FGFPTSafetyMarginInMs{ 0.01f };
|
||||
CustomOptional<float> FGFPTVarianceFactor{ 0.3f };
|
||||
CustomOptional<bool> FGFPTAllowHybridSpin{ true };
|
||||
CustomOptional<int> FGFPTHybridSpinTime{ 2 };
|
||||
CustomOptional<bool> FGFPTAllowWaitForSingleObjectOnFence{ false };
|
||||
// OptiFG
|
||||
CustomOptional<bool> FGEnabled{ false };
|
||||
CustomOptional<bool> FGHighPriority{ true };
|
||||
CustomOptional<bool> FGDebugView{ false };
|
||||
CustomOptional<bool> FGAsync{ false };
|
||||
CustomOptional<bool> FGHUDFix{ false };
|
||||
CustomOptional<bool> FGHUDFixExtended{ false };
|
||||
CustomOptional<bool> FGImmediateCapture{ false };
|
||||
CustomOptional<int> FGHUDLimit{ 1 };
|
||||
CustomOptional<int, NoDefault> FGRectLeft;
|
||||
CustomOptional<int, NoDefault> FGRectTop;
|
||||
CustomOptional<int, NoDefault> FGRectWidth;
|
||||
CustomOptional<int, NoDefault> FGRectHeight;
|
||||
CustomOptional<bool> FGDisableOverlays{ false };
|
||||
CustomOptional<bool> FGAlwaysTrackHeaps{ false };
|
||||
CustomOptional<bool> FGMakeDepthCopy{ true };
|
||||
CustomOptional<bool> FGEnableDepthScale{ false };
|
||||
CustomOptional<float> FGDepthScaleMax{ 10000.0f };
|
||||
CustomOptional<bool> FGMakeMVCopy{ true };
|
||||
CustomOptional<bool> FGHudFixCloseAfterCallback{ true };
|
||||
CustomOptional<bool> FGUseMutexForSwaphain{ true };
|
||||
CustomOptional<bool> FGFramePacingTuning{ true };
|
||||
CustomOptional<float> FGFPTSafetyMarginInMs{ 0.01f };
|
||||
CustomOptional<float> FGFPTVarianceFactor{ 0.3f };
|
||||
CustomOptional<bool> FGFPTAllowHybridSpin{ true };
|
||||
CustomOptional<int> FGFPTHybridSpinTime{ 2 };
|
||||
CustomOptional<bool> FGFPTAllowWaitForSingleObjectOnFence{ false };
|
||||
|
||||
// DLSS Enabler
|
||||
std::optional<int> DE_FramerateLimit; // off - vsync - number
|
||||
std::optional<bool> DE_FramerateLimitVsync;
|
||||
std::optional<int> DE_DynamicLimitAvailable; // DFG.Available
|
||||
std::optional<int> DE_DynamicLimitEnabled; // DFG.Enabled
|
||||
std::optional<std::string> DE_Generator; // auto - fsr30 - fsr31 - dlssg // "auto"
|
||||
std::optional<std::string> DE_Reflex; // on - boost - off // "on"
|
||||
std::optional<std::string> DE_ReflexEmu; // auto - on - off // "auto"
|
||||
// DLSS Enabler
|
||||
std::optional<int> DE_FramerateLimit; // off - vsync - number
|
||||
std::optional<bool> DE_FramerateLimitVsync;
|
||||
std::optional<int> DE_DynamicLimitAvailable; // DFG.Available
|
||||
std::optional<int> DE_DynamicLimitEnabled; // DFG.Enabled
|
||||
std::optional<std::string> DE_Generator; // auto - fsr30 - fsr31 - dlssg // "auto"
|
||||
std::optional<std::string> DE_Reflex; // on - boost - off // "on"
|
||||
std::optional<std::string> DE_ReflexEmu; // auto - on - off // "auto"
|
||||
|
||||
// fakenvapi
|
||||
CustomOptional<bool> FN_EnableLogs{ true };
|
||||
CustomOptional<bool> FN_EnableTraceLogs{ false };
|
||||
CustomOptional<bool> FN_ForceLatencyFlex{ false };
|
||||
CustomOptional<uint32_t> FN_LatencyFlexMode{ 0 }; // conservative - aggressive - reflex ids
|
||||
CustomOptional<uint32_t> FN_ForceReflex{ 0 }; // in-game - force disable - force enable
|
||||
// fakenvapi
|
||||
CustomOptional<bool> FN_EnableLogs{ true };
|
||||
CustomOptional<bool> FN_EnableTraceLogs{ false };
|
||||
CustomOptional<bool> FN_ForceLatencyFlex{ false };
|
||||
CustomOptional<uint32_t> FN_LatencyFlexMode{ 0 }; // conservative - aggressive - reflex ids
|
||||
CustomOptional<uint32_t> FN_ForceReflex{ 0 }; // in-game - force disable - force enable
|
||||
|
||||
// Inputs
|
||||
CustomOptional<bool> DlssInputs{ true };
|
||||
CustomOptional<bool> XeSSInputs{ true };
|
||||
CustomOptional<bool> Fsr2Inputs{ true };
|
||||
CustomOptional<bool> Fsr2Pattern{ false };
|
||||
CustomOptional<bool> Fsr3Inputs{ true };
|
||||
CustomOptional<bool> Fsr3Pattern{ false };
|
||||
CustomOptional<bool> FfxInputs{ true };
|
||||
CustomOptional<bool> EnableHotSwapping{ true };
|
||||
// Inputs
|
||||
CustomOptional<bool> DlssInputs{ true };
|
||||
CustomOptional<bool> XeSSInputs{ true };
|
||||
CustomOptional<bool> Fsr2Inputs{ true };
|
||||
CustomOptional<bool> Fsr2Pattern{ false };
|
||||
CustomOptional<bool> Fsr3Inputs{ true };
|
||||
CustomOptional<bool> Fsr3Pattern{ false };
|
||||
CustomOptional<bool> FfxInputs{ true };
|
||||
CustomOptional<bool> EnableHotSwapping{ true };
|
||||
|
||||
// Framerate
|
||||
CustomOptional<float> FramerateLimit{ 0.0f };
|
||||
// Framerate
|
||||
CustomOptional<float> FramerateLimit{ 0.0f };
|
||||
|
||||
// HDR
|
||||
CustomOptional<bool> ForceHDR{ false };
|
||||
CustomOptional<bool> UseHDR10{ false };
|
||||
// HDR
|
||||
CustomOptional<bool> ForceHDR{ false };
|
||||
CustomOptional<bool> UseHDR10{ false };
|
||||
|
||||
bool LoadFromPath(const wchar_t* InPath);
|
||||
bool SaveIni();
|
||||
bool LoadFromPath(const wchar_t* InPath);
|
||||
bool SaveIni();
|
||||
|
||||
bool ReloadFakenvapi();
|
||||
bool SaveFakenvapiIni();
|
||||
bool ReloadFakenvapi();
|
||||
bool SaveFakenvapiIni();
|
||||
|
||||
void CheckUpscalerFiles();
|
||||
void CheckUpscalerFiles();
|
||||
|
||||
static Config* Instance();
|
||||
static Config* Instance();
|
||||
|
||||
private:
|
||||
inline static Config* _config;
|
||||
inline static Config* _config;
|
||||
|
||||
CSimpleIniA ini;
|
||||
CSimpleIniA fakenvapiIni;
|
||||
std::filesystem::path absoluteFileName;
|
||||
std::wstring fileName = L"OptiScaler.ini";
|
||||
CSimpleIniA ini;
|
||||
CSimpleIniA fakenvapiIni;
|
||||
std::filesystem::path absoluteFileName;
|
||||
std::wstring fileName = L"OptiScaler.ini";
|
||||
|
||||
bool Reload(std::filesystem::path iniPath);
|
||||
bool Reload(std::filesystem::path iniPath);
|
||||
|
||||
std::optional<std::string> readString(std::string section, std::string key, bool lowercase = false);
|
||||
std::optional<std::wstring> readWString(std::string section, std::string key, bool lowercase = false);
|
||||
std::optional<float> readFloat(std::string section, std::string key);
|
||||
std::optional<int> readInt(std::string section, std::string key);
|
||||
std::optional<uint32_t> readUInt(std::string section, std::string key);
|
||||
std::optional<bool> readBool(std::string section, std::string key);
|
||||
std::optional<std::string> readString(std::string section, std::string key, bool lowercase = false);
|
||||
std::optional<std::wstring> readWString(std::string section, std::string key, bool lowercase = false);
|
||||
std::optional<float> readFloat(std::string section, std::string key);
|
||||
std::optional<int> readInt(std::string section, std::string key);
|
||||
std::optional<uint32_t> readUInt(std::string section, std::string key);
|
||||
std::optional<bool> readBool(std::string section, std::string key);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user