diff --git a/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp b/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp index 148b9dfc..6bdbf7f3 100644 --- a/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp +++ b/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp @@ -334,7 +334,7 @@ ffxReturnCode_t FSRFG_Dx12::DispatchCallback(ffxDispatchDescFrameGeneration* par const int fIndex = params->frameID % BUFFER_COUNT; if (!Config::Instance()->FGSkipReset.value_or_default()) - params->reset = (_reset[fIndex] != 0); + params->reset = (_reset[fIndex] != 0); else params->reset = 0; diff --git a/OptiScaler/framegen/xefg/XeFG_Dx12.cpp b/OptiScaler/framegen/xefg/XeFG_Dx12.cpp index f6cbb8ce..62e7d60f 100644 --- a/OptiScaler/framegen/xefg/XeFG_Dx12.cpp +++ b/OptiScaler/framegen/xefg/XeFG_Dx12.cpp @@ -556,9 +556,9 @@ bool XeFG_Dx12::Dispatch() std::swap(_cameraNear[fIndex], _cameraFar[fIndex]); if (_infiniteDepth && _cameraFar[fIndex] > _cameraNear[fIndex]) - _cameraFar[fIndex] = INFINITY; + _cameraFar[fIndex] = std::numeric_limits::infinity(); else if (_infiniteDepth && _cameraNear[fIndex] > _cameraFar[fIndex]) - _cameraNear[fIndex] = INFINITY; + _cameraNear[fIndex] = std::numeric_limits::infinity(); // Cyberpunk seems to be sending LH so do the same // it also sends some extra data in usually empty spots but no idea what that is @@ -584,7 +584,7 @@ bool XeFG_Dx12::Dispatch() constData.motionVectorScaleY = _mvScaleY[fIndex]; if (!Config::Instance()->FGSkipReset.value_or_default()) - constData.resetHistory = _reset[fIndex]; + constData.resetHistory = _reset[fIndex]; else constData.resetHistory = false; diff --git a/OptiScaler/inputs/FG/DLSSG_Mod.h b/OptiScaler/inputs/FG/DLSSG_Mod.h index 6d455094..9f533924 100644 --- a/OptiScaler/inputs/FG/DLSSG_Mod.h +++ b/OptiScaler/inputs/FG/DLSSG_Mod.h @@ -282,7 +282,7 @@ class DLSSGMod InParameters->Set("DLSSG.CameraFar", cameraFar); } - else if (cameraFar == INFINITY) + else if (std::isinf(cameraFar)) { cameraFar = 100000.0f; InParameters->Set("DLSSG.CameraFar", cameraFar); @@ -499,7 +499,7 @@ class DLSSGMod InParameters->Set("DLSSG.CameraFar", cameraFar); } - else if (cameraFar == INFINITY) + else if (std::isinf(cameraFar)) { cameraFar = 10000; InParameters->Set("DLSSG.CameraFar", cameraFar); diff --git a/OptiScaler/menu/menu_common.cpp b/OptiScaler/menu/menu_common.cpp index 983eaec6..feb70285 100644 --- a/OptiScaler/menu/menu_common.cpp +++ b/OptiScaler/menu/menu_common.cpp @@ -4036,7 +4036,7 @@ bool MenuCommon::RenderMenu() } // set initial value - if (_limitFps == INFINITY) + if (std::isinf(_limitFps)) _limitFps = Config::Instance()->FramerateLimit.value_or_default(); ImGui::SliderFloat("FPS Limit", &_limitFps, 0, 200, "%.0f"); diff --git a/OptiScaler/menu/menu_common.h b/OptiScaler/menu/menu_common.h index ba46981d..fd2dea15 100644 --- a/OptiScaler/menu/menu_common.h +++ b/OptiScaler/menu/menu_common.h @@ -52,7 +52,7 @@ class MenuCommon inline static UINT64 _frameCount = 0; // reflex - inline static float _limitFps = INFINITY; + inline static float _limitFps = std::numeric_limits::infinity(); // fsr3x inline static int _fsr3xIndex = -1;