diff --git a/OptiScaler/State.h b/OptiScaler/State.h index dd78ca7e..2b355a12 100644 --- a/OptiScaler/State.h +++ b/OptiScaler/State.h @@ -85,30 +85,30 @@ class State return instance; } - std::string GameExe; - std::string GameName; - std::string GameVersion; - GameEngineType GameEngine = GameEngineType::Other; + std::string gameExe; + std::string gameName; + std::string gameVersion; + GameEngineType gameEngine = GameEngineType::Other; - bool NvngxDx11Inited = false; - bool NvngxDx12Inited = false; - bool NvngxVkInited = false; + bool nvngxDx11Inited = false; + bool nvngxDx12Inited = false; + bool nvngxVkInited = false; flag_set gameQuirks; bool isOptiPatcherSucceed = false; // Reseting on creation of new feature - std::optional AutoExposure; + std::optional autoExposure; // FG - UINT64 FGLastFrame = 0; + uint64_t fgLastFrame = 0; // Nvngx FG, uses streamline swapchain - bool NvngxFgFilesAvailable = false; - bool DLSSGDebugView = false; - bool DLSSGInterpolatedOnly = false; + bool nvngxFgFilesAvailable = false; + bool dlssgDebugView = false; + bool dlssgInterpolatedOnly = false; + uint64_t dlssgLastFrame = 0; uint32_t delayMenuRenderBy = 0; - UINT64 DLSSGLastFrame = 0; // FSR Common float lastFsrCameraNear = 0.0f; @@ -122,23 +122,23 @@ class State Sl_Inputs_Dx12 slFGInputs = {}; // OptiFG - bool FGPresentIsCalled = false; - bool FGonlyGenerated = false; - bool FGHudlessCompare = false; - bool FGchanged = false; - bool SCchanged = false; + bool fgPresentIsCalled = false; + bool fgOnlyGenerated = false; + bool fgHudlessCompare = false; + bool fgChanged = false; + bool scChanged = false; bool skipHeapCapture = false; - bool FGcaptureResources = false; - size_t FGcapturedResourceCount = 0; - bool FGresetCapturedResources = false; - bool FGonlyUseCapturedResources = false; + bool fgCaptureResources = false; + size_t fgCapturedResourceCount = 0; + bool fgResetCapturedResources = false; + bool fgOnlyUseCapturedResources = false; - bool FSRFGFTPchanged = false; - bool FSRFGInputActive = false; + bool fsrfgFramePaceTuningChanged = false; + bool fsrfgInputActive = false; - ankerl::unordered_dense::map CapturedHudlesses; - bool ClearCapturedHudlesses = false; + ankerl::unordered_dense::map capturedHudlesses; + bool clearCapturedHudlesses = false; // NVNGX init parameters uint64_t NVNGX_ApplicationId = 1337; @@ -284,7 +284,7 @@ class State UINT SCLastFlags = 0; // HDR - std::vector SCbuffers; + std::vector scBuffers; bool isHdrActive = false; std::optional setInputApiName; diff --git a/OptiScaler/Util.cpp b/OptiScaler/Util.cpp index e206aabb..8bd575c8 100644 --- a/OptiScaler/Util.cpp +++ b/OptiScaler/Util.cpp @@ -171,7 +171,7 @@ void Util::GetExeInfo() auto exeDir = exePath.parent_path(); auto exePathFilename = exePath.filename().string(); auto exePathFilenameW = exePath.filename().wstring(); - State::Instance().GameExe = exePathFilename; + State::Instance().gameExe = exePathFilename; wchar_t sysFolder[MAX_PATH]; GetSystemDirectory(sysFolder, MAX_PATH); @@ -235,16 +235,16 @@ void Util::GetExeInfo() if (!productName.empty()) { - State::Instance().GameName = wstring_to_string(productName); + State::Instance().gameName = wstring_to_string(productName); } if (!productVersion.empty()) { - State::Instance().GameVersion = wstring_to_string(productVersion); + State::Instance().gameVersion = wstring_to_string(productVersion); } else if (!fileVersion.empty()) { - State::Instance().GameVersion = wstring_to_string(fileVersion); + State::Instance().gameVersion = wstring_to_string(fileVersion); } std::wstring productLower = ToLower(productName); @@ -263,7 +263,7 @@ void Util::GetExeInfo() if (isUnity) { - State::Instance().GameEngine = GameEngineType::Unity; + State::Instance().gameEngine = GameEngineType::Unity; return; } @@ -283,7 +283,7 @@ void Util::GetExeInfo() if (isUnreal) { - State::Instance().GameEngine = GameEngineType::Unreal; + State::Instance().gameEngine = GameEngineType::Unreal; return; } } diff --git a/OptiScaler/dllmain.cpp b/OptiScaler/dllmain.cpp index e50bdf43..7a3487f8 100644 --- a/OptiScaler/dllmain.cpp +++ b/OptiScaler/dllmain.cpp @@ -1225,10 +1225,10 @@ static void CheckQuirks(bool isNvidia) { Util::GetExeInfo(); - LOG_INFO("Game's Exe: {0}", State::Instance().GameExe); - LOG_INFO("Game Name: {0}", State::Instance().GameName); - LOG_INFO("Game Version: {0}", State::Instance().GameVersion); - LOG_INFO("Game Engine: {0}", magic_enum::enum_name(State::Instance().GameEngine)); + LOG_INFO("Game's Exe: {0}", State::Instance().gameExe); + LOG_INFO("Game Name: {0}", State::Instance().gameName); + LOG_INFO("Game Version: {0}", State::Instance().gameVersion); + LOG_INFO("Game Engine: {0}", magic_enum::enum_name(State::Instance().gameEngine)); #ifndef _DEBUG // Hash is very slow on Debug builds + we don't need to check our own hashes @@ -1244,7 +1244,7 @@ static void CheckQuirks(bool isNvidia) } #endif - auto quirks = getQuirksForExe(State::Instance().GameExe); + auto quirks = getQuirksForExe(State::Instance().gameExe); auto state = &State::Instance(); diff --git a/OptiScaler/framegen/IFGFeature.cpp b/OptiScaler/framegen/IFGFeature.cpp index 2e7b4861..5ff93d2b 100644 --- a/OptiScaler/framegen/IFGFeature.cpp +++ b/OptiScaler/framegen/IFGFeature.cpp @@ -155,7 +155,7 @@ int IFGFeature::GetDispatchIndex(UINT64& willDispatchFrame) } _lastDispatchedFrame = willDispatchFrame; - _lastFGFrame = State::Instance().FGLastFrame; + _lastFGFrame = State::Instance().fgLastFrame; return (willDispatchFrame % BUFFER_COUNT); } diff --git a/OptiScaler/framegen/dlssg/DLSSG_Dx12.cpp b/OptiScaler/framegen/dlssg/DLSSG_Dx12.cpp index 58e8066d..083b803d 100644 --- a/OptiScaler/framegen/dlssg/DLSSG_Dx12.cpp +++ b/OptiScaler/framegen/dlssg/DLSSG_Dx12.cpp @@ -256,7 +256,7 @@ void DLSSG_Dx12::CreateContext(ID3D12Device* device, FG_Constants& fgConstants) if (_isActive) { LOG_INFO("FG context recreated while active, pausing"); - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; UpdateTarget(); Deactivate(); } @@ -533,7 +533,7 @@ bool DLSSG_Dx12::Dispatch() { LOG_ERROR("GetNewFrameToken error: {} ({})", magic_enum::enum_name(tokenResult), (UINT) tokenResult); - state.FGchanged = true; + state.fgChanged = true; UpdateTarget(); Deactivate(); @@ -545,7 +545,7 @@ bool DLSSG_Dx12::Dispatch() { LOG_ERROR("SetConstants error: {} ({})", magic_enum::enum_name(result), (UINT) result); - state.FGchanged = true; + state.fgChanged = true; UpdateTarget(); Deactivate(); @@ -590,7 +590,7 @@ void DLSSG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) // Create it again CreateContext(device, fgConstants); } - else if (state.FGchanged) + else if (state.fgChanged) { LOG_DEBUG("FGChanged"); Deactivate(); @@ -607,15 +607,15 @@ void DLSSG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) LOG_DEBUG("!FGEnabled"); Deactivate(); - state.ClearCapturedHudlesses = true; + state.clearCapturedHudlesses = true; Hudfix_Dx12::ResetCounters(); } - if (state.FGchanged) + if (state.fgChanged) { LOG_DEBUG("FGchanged"); - state.FGchanged = false; + state.fgChanged = false; Hudfix_Dx12::ResetCounters(); @@ -627,7 +627,7 @@ void DLSSG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) Mutex.unlockThis(2); } - state.SCchanged = false; + state.scChanged = false; } void DLSSG_Dx12::ReleaseObjects() @@ -776,7 +776,7 @@ bool DLSSG_Dx12::Present() if (IsActive() && !IsPaused()) { - if (State::Instance().FGHudlessCompare) + if (State::Instance().fgHudlessCompare) { auto hudless = GetResource(FG_ResourceType::HudlessColor, fIndex); if (hudless != nullptr && (hudless->validity == FG_ResourceValidity::UntilPresent || @@ -874,7 +874,7 @@ bool DLSSG_Dx12::SetResource(Dx12Resource* inputResource) return false; // Making a copy if it's just valid now to be able to use it later - if (State::Instance().FGHudlessCompare && inputResource->validity == FG_ResourceValidity::ValidNow) + if (State::Instance().fgHudlessCompare && inputResource->validity == FG_ResourceValidity::ValidNow) inputResource->validity = FG_ResourceValidity::ValidButMakeCopy; if (!_noHudless[fIndex] && (_frameResources[fIndex][type].validity == FG_ResourceValidity::ValidNow)) @@ -997,7 +997,7 @@ bool DLSSG_Dx12::SetResource(Dx12Resource* inputResource) if (lastFormat[fIndex] != DXGI_FORMAT_UNKNOWN && lastFormat[fIndex] != desc.Format) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; return false; } @@ -1066,7 +1066,7 @@ bool DLSSG_Dx12::SetResource(Dx12Resource* inputResource) if (result != sl::Result::eOk) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; UpdateTarget(); Deactivate(); diff --git a/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp b/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp index e3a86e3b..9fb9ce78 100644 --- a/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp +++ b/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp @@ -258,7 +258,7 @@ typedef struct FfxSwapchainFramePacingTuning void FSRFG_Dx12::ConfigureFramePaceTuning() { - State::Instance().FSRFGFTPchanged = false; + State::Instance().fsrfgFramePaceTuningChanged = false; if (_swapChainContext == nullptr || Version() < feature_version { 3, 1, 3 }) return; @@ -333,7 +333,7 @@ bool FSRFG_Dx12::Dispatch() auto& state = State::Instance(); auto config = Config::Instance(); - if (state.FSRFGFTPchanged) + if (state.fsrfgFramePaceTuningChanged) ConfigureFramePaceTuning(); LOG_DEBUG("_frameCount: {}, willDispatchFrame: {}, fIndex: {}", _frameCount, willDispatchFrame, fIndex); @@ -397,8 +397,8 @@ bool FSRFG_Dx12::Dispatch() if (localLastHudlessFormat != _lastHudlessFormat) { - state.FGchanged = true; - state.SCchanged = true; + state.fgChanged = true; + state.scChanged = true; LOG_DEBUG("HUDLESS format changed, triggering FG reinit"); } @@ -461,7 +461,7 @@ bool FSRFG_Dx12::Dispatch() return FFX_API_RETURN_ERROR; }; - fgConfig.onlyPresentGenerated = state.FGonlyGenerated; + fgConfig.onlyPresentGenerated = state.fgOnlyGenerated; fgConfig.frameID = willDispatchFrame; fgConfig.swapChain = _swapChain; @@ -598,14 +598,14 @@ ffxReturnCode_t FSRFG_Dx12::DispatchCallback(ffxDispatchDescFrameGeneration* par params->numGeneratedFrames); // check for status - if (!Config::Instance()->FGEnabled.value_or_default() || _fgContext == nullptr || state.SCchanged) + if (!Config::Instance()->FGEnabled.value_or_default() || _fgContext == nullptr || state.scChanged) { LOG_WARN("Cancel async dispatch"); params->numGeneratedFrames = 0; } // If fg is active but upscaling paused - if ((state.currentFeature == nullptr && state.activeFgInput == FGInput::Upscaler) || state.FGchanged || + if ((state.currentFeature == nullptr && state.activeFgInput == FGInput::Upscaler) || state.fgChanged || fIndex < 0 || !IsActive() || (state.currentFeature && state.currentFeature->FrameCount() == 0)) { LOG_WARN("Upscaling paused! frameID: {}", params->frameID); @@ -632,8 +632,8 @@ ffxReturnCode_t FSRFG_Dx12::DispatchCallback(ffxDispatchDescFrameGeneration* par // params->numGeneratedFrames = 0; // _lastFrameId = params->frameID; - // state.FGchanged = true; - // state.SCchanged = true; + // state.fgChanged = true; + // state.scChanged = true; // return FFX_API_RETURN_OK; //} @@ -653,8 +653,8 @@ ffxReturnCode_t FSRFG_Dx12::DispatchCallback(ffxDispatchDescFrameGeneration* par params->numGeneratedFrames = 0; _lastFrameId = params->frameID; - state.FGchanged = true; - state.SCchanged = true; + state.fgChanged = true; + state.scChanged = true; return FFX_API_RETURN_OK; } @@ -663,7 +663,7 @@ ffxReturnCode_t FSRFG_Dx12::DispatchCallback(ffxDispatchDescFrameGeneration* par bool applyHudCutoff = Config::Instance()->FGHudCutoff.value_or_default() > 0.0f || State::Instance().gameQuirks & GameQuirk::FSRFGHudlessMismatchFixup; - if ((applyHudCutoff || State::Instance().FGHudlessCompare) && !lastFGDisableHudless) + if ((applyHudCutoff || State::Instance().fgHudlessCompare) && !lastFGDisableHudless) { auto presentWithHud = (ID3D12Resource*) params->presentColor.resource; auto hudlessResource = _resourceCopy[fIndex][FG_ResourceType::HudlessColor]; @@ -710,7 +710,7 @@ ffxReturnCode_t FSRFG_Dx12::DispatchCallback(ffxDispatchDescFrameGeneration* par } } - if (State::Instance().FGHudlessCompare) + if (State::Instance().fgHudlessCompare) { if (hudlessResource != nullptr) { @@ -1246,16 +1246,16 @@ void FSRFG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) lastInfiniteDepth = currentInfiniteDepth; LOG_DEBUG("Infinite Depth changed: {}", currentInfiniteDepth); - State::Instance().FGchanged = true; - State::Instance().SCchanged = true; + State::Instance().fgChanged = true; + State::Instance().scChanged = true; } if (_maxRenderWidth != 0 && _maxRenderHeight != 0 && IsActive() && !IsPaused() && (fgConstants.displayWidth > _maxRenderWidth || fgConstants.displayHeight > _maxRenderHeight)) { - State::Instance().FGchanged = true; - State::Instance().SCchanged = true; + State::Instance().fgChanged = true; + State::Instance().scChanged = true; } // If FG Enabled from menu @@ -1271,7 +1271,7 @@ void FSRFG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) UpdateTarget(); } // If there is a change deactivate it - else if (State::Instance().FGchanged) + else if (State::Instance().fgChanged) { Deactivate(); @@ -1279,7 +1279,7 @@ void FSRFG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) UpdateTarget(); // Destroy if Swapchain has a change destroy FG Context too - if (State::Instance().SCchanged) + if (State::Instance().scChanged) DestroyFGContext(); } @@ -1290,15 +1290,15 @@ void FSRFG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) { Deactivate(); - State::Instance().ClearCapturedHudlesses = true; + State::Instance().clearCapturedHudlesses = true; Hudfix_Dx12::ResetCounters(); } - if (State::Instance().FGchanged) + if (State::Instance().fgChanged) { LOG_DEBUG("FGchanged"); - State::Instance().FGchanged = false; + State::Instance().fgChanged = false; Hudfix_Dx12::ResetCounters(); @@ -1310,7 +1310,7 @@ void FSRFG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) Mutex.unlockThis(2); } - State::Instance().SCchanged = false; + State::Instance().scChanged = false; } void FSRFG_Dx12::ReleaseObjects() diff --git a/OptiScaler/framegen/xefg/XeFG_Dx12.cpp b/OptiScaler/framegen/xefg/XeFG_Dx12.cpp index a1b29b35..6a100605 100644 --- a/OptiScaler/framegen/xefg/XeFG_Dx12.cpp +++ b/OptiScaler/framegen/xefg/XeFG_Dx12.cpp @@ -606,7 +606,7 @@ void XeFG_Dx12::CreateContext(ID3D12Device* device, FG_Constants& fgConstants) if (_isActive) { LOG_INFO("FG context recreated while active, pausing"); - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; UpdateTarget(); Deactivate(); } @@ -782,7 +782,7 @@ bool XeFG_Dx12::Dispatch() { state.WAR_xefgRequestFGToggle = false; - state.FGchanged = true; + state.fgChanged = true; UpdateTarget(); Deactivate(); } @@ -804,7 +804,7 @@ bool XeFG_Dx12::Dispatch() usingHudless); _haveHudless = usingHudless; - state.FGchanged = true; + state.fgChanged = true; UpdateTarget(); Deactivate(); @@ -837,7 +837,7 @@ bool XeFG_Dx12::Dispatch() XeFGProxy::EnableDebugFeature()(_swapChainContext, XEFG_SWAPCHAIN_DEBUG_FEATURE_TAG_INTERPOLATED_FRAMES, Config::Instance()->FGXeFGDebugView.value_or_default(), nullptr); XeFGProxy::EnableDebugFeature()(_swapChainContext, XEFG_SWAPCHAIN_DEBUG_FEATURE_SHOW_ONLY_INTERPOLATION, - state.FGonlyGenerated, nullptr); + state.fgOnlyGenerated, nullptr); xefg_swapchain_frame_constant_data_t constData = {}; @@ -922,7 +922,7 @@ bool XeFG_Dx12::Dispatch() { LOG_ERROR("TagFrameConstants error: {} ({})", magic_enum::enum_name(result), (UINT) result); - state.FGchanged = true; + state.fgChanged = true; UpdateTarget(); Deactivate(); @@ -934,7 +934,7 @@ bool XeFG_Dx12::Dispatch() { LOG_ERROR("SetPresentId error: {} ({})", magic_enum::enum_name(result), (UINT) result); - state.FGchanged = true; + state.fgChanged = true; UpdateTarget(); Deactivate(); @@ -985,7 +985,7 @@ bool XeFG_Dx12::Dispatch() { LOG_ERROR("D3D12TagFrameResource Backbuffer error: {} ({})", magic_enum::enum_name(result), (UINT) result); - state.FGchanged = true; + state.fgChanged = true; UpdateTarget(); Deactivate(); } @@ -1035,7 +1035,7 @@ void XeFG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) UpdateTarget(); } // If there is a change deactivate it - else if (state.FGchanged) + else if (state.fgChanged) { LOG_DEBUG("FGChanged"); Deactivate(); @@ -1044,7 +1044,7 @@ void XeFG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) UpdateTarget(); // Destroy if Swapchain has a change destroy FG Context too - if (state.SCchanged) + if (state.scChanged) DestroyFGContext(); } @@ -1056,15 +1056,15 @@ void XeFG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) LOG_DEBUG("!FGEnabled"); Deactivate(); - state.ClearCapturedHudlesses = true; + state.clearCapturedHudlesses = true; Hudfix_Dx12::ResetCounters(); } - if (state.FGchanged) + if (state.fgChanged) { LOG_DEBUG("FGchanged"); - state.FGchanged = false; + state.fgChanged = false; Hudfix_Dx12::ResetCounters(); @@ -1076,7 +1076,7 @@ void XeFG_Dx12::EvaluateState(ID3D12Device* device, FG_Constants& fgConstants) Mutex.unlockThis(2); } - state.SCchanged = false; + state.scChanged = false; } void XeFG_Dx12::ReleaseObjects() @@ -1218,7 +1218,7 @@ bool XeFG_Dx12::Present() if (IsActive() && !IsPaused()) { - if (State::Instance().FGHudlessCompare) + if (State::Instance().fgHudlessCompare) { auto hudless = GetResource(FG_ResourceType::HudlessColor, fIndex); if (hudless != nullptr && (hudless->validity == FG_ResourceValidity::UntilPresent || @@ -1322,7 +1322,7 @@ bool XeFG_Dx12::SetResource(Dx12Resource* inputResource) return false; // Making a copy if it's just valid now to be able to use it later - if (State::Instance().FGHudlessCompare && inputResource->validity == FG_ResourceValidity::ValidNow) + if (State::Instance().fgHudlessCompare && inputResource->validity == FG_ResourceValidity::ValidNow) inputResource->validity = FG_ResourceValidity::ValidButMakeCopy; if (!_noHudless[fIndex] && (_frameResources[fIndex][type].validity == FG_ResourceValidity::ValidNow)) @@ -1477,7 +1477,7 @@ bool XeFG_Dx12::SetResource(Dx12Resource* inputResource) if (lastFormat[fIndex] != DXGI_FORMAT_UNKNOWN && lastFormat[fIndex] != desc.Format) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; return false; } @@ -1523,7 +1523,7 @@ bool XeFG_Dx12::SetResource(Dx12Resource* inputResource) if (result != XEFG_SWAPCHAIN_RESULT_SUCCESS) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; UpdateTarget(); Deactivate(); diff --git a/OptiScaler/hooks/FG_Hooks.cpp b/OptiScaler/hooks/FG_Hooks.cpp index 5466b43f..460b3ec5 100644 --- a/OptiScaler/hooks/FG_Hooks.cpp +++ b/OptiScaler/hooks/FG_Hooks.cpp @@ -378,7 +378,7 @@ HRESULT FGHooks::hkSetFullscreenState(IDXGISwapChain* This, BOOL Fullscreen, IDX auto fg = State::Instance().currentFG; if (fg != nullptr && fg->IsActive()) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; fg->UpdateTarget(); fg->Deactivate(); } @@ -622,7 +622,7 @@ HRESULT FGHooks::hkResizeBuffers(IDXGISwapChain* This, UINT BufferCount, UINT Wi if (fg != nullptr && fg->IsActive()) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; fg->UpdateTarget(); fg->Deactivate(); } @@ -674,7 +674,7 @@ HRESULT FGHooks::hkResizeBuffers(IDXGISwapChain* This, UINT BufferCount, UINT Wi auto fg = State::Instance().currentFG; if (fg != nullptr) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; fg->Deactivate(); fg->UpdateTarget(); } @@ -710,7 +710,7 @@ HRESULT FGHooks::hkResizeTarget(IDXGISwapChain* This, const DXGI_MODE_DESC* pNew auto fg = State::Instance().currentFG; if (fg != nullptr && fg->IsActive()) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; fg->UpdateTarget(); fg->Deactivate(); } @@ -857,7 +857,7 @@ HRESULT FGHooks::hkResizeBuffers1(IDXGISwapChain3* This, UINT BufferCount, UINT if (fg != nullptr && fg->IsActive()) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; fg->UpdateTarget(); fg->Deactivate(); } @@ -914,7 +914,7 @@ HRESULT FGHooks::hkResizeBuffers1(IDXGISwapChain3* This, UINT BufferCount, UINT auto fg = State::Instance().currentFG; if (fg != nullptr) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; fg->Deactivate(); fg->UpdateTarget(); } @@ -1024,7 +1024,7 @@ HRESULT FGHooks::FGPresent(IDXGISwapChain* This, UINT SyncInterval, UINT Flags, if (willPresent) { - State::Instance().FGLastFrame++; + State::Instance().fgLastFrame++; double ftDelta = 0.0f; auto now = Util::MillisecondsNow(); @@ -1126,7 +1126,7 @@ HRESULT FGHooks::FGPresent(IDXGISwapChain* This, UINT SyncInterval, UINT Flags, // Used at wrapped_swapchain LocalPresent to determine is frame is interpolated or not if (willPresent) - State::Instance().FGPresentIsCalled = true; + State::Instance().fgPresentIsCalled = true; HRESULT result; if (pPresentParameters == nullptr) diff --git a/OptiScaler/hooks/Reflex_Hooks.cpp b/OptiScaler/hooks/Reflex_Hooks.cpp index 297f332d..83b94730 100644 --- a/OptiScaler/hooks/Reflex_Hooks.cpp +++ b/OptiScaler/hooks/Reflex_Hooks.cpp @@ -145,7 +145,7 @@ NvAPI_Status ReflexHooks::hkNvAPI_D3D_SetLatencyMarker(IUnknown* pDev, static bool skip[20] = {}; if (pSetLatencyMarkerParams->markerType == SIMULATION_START) - _lastMarkerFrame = State::Instance().FGLastFrame; + _lastMarkerFrame = State::Instance().fgLastFrame; if ((State::Instance().activeFgOutput == FGOutput::DLSSG || State::Instance().activeFgOutput == FGOutput::DLSSGWithNvngx) && @@ -720,6 +720,6 @@ void ReflexHooks::setFPSLimit(float fps) bool ReflexHooks::gameIsSendingMarkers() { - return _lastMarkerFrame != 0 && ((State::Instance().FGLastFrame < _lastMarkerFrame) || - (State::Instance().FGLastFrame - _lastMarkerFrame) < 5); + return _lastMarkerFrame != 0 && ((State::Instance().fgLastFrame < _lastMarkerFrame) || + (State::Instance().fgLastFrame - _lastMarkerFrame) < 5); } diff --git a/OptiScaler/hudfix/Hudfix_Dx12.cpp b/OptiScaler/hudfix/Hudfix_Dx12.cpp index b4bcc0e6..f03cc5b4 100644 --- a/OptiScaler/hudfix/Hudfix_Dx12.cpp +++ b/OptiScaler/hudfix/Hudfix_Dx12.cpp @@ -338,7 +338,7 @@ bool Hudfix_Dx12::CheckResource(ResourceInfo* resource) return false; } - if (State::Instance().FGonlyUseCapturedResources) + if (State::Instance().fgOnlyUseCapturedResources) { auto result = _captureList.find(resource->buffer) != _captureList.end(); return result; @@ -484,20 +484,20 @@ bool Hudfix_Dx12::CheckForRealObject(std::string functionName, IUnknown* pObject void Hudfix_Dx12::UpscaleStart() { - if (State::Instance().FGresetCapturedResources) + if (State::Instance().fgResetCapturedResources) { std::lock_guard lock(_captureMutex); _captureList.clear(); LOG_DEBUG("FGResetCapturedResources"); - State::Instance().FGcapturedResourceCount = 0; - State::Instance().FGresetCapturedResources = false; + State::Instance().fgCapturedResourceCount = 0; + State::Instance().fgResetCapturedResources = false; } - if (State::Instance().ClearCapturedHudlesses) + if (State::Instance().clearCapturedHudlesses) { LOG_DEBUG("ClearCapturedHudlesses"); - State::Instance().ClearCapturedHudlesses = false; - State::Instance().CapturedHudlesses.clear(); + State::Instance().clearCapturedHudlesses = false; + State::Instance().capturedHudlesses.clear(); } } @@ -555,9 +555,9 @@ bool Hudfix_Dx12::IsResourceCheckActive() return false; } - if (!State::Instance().currentFG->IsActive() || State::Instance().FGchanged) + if (!State::Instance().currentFG->IsActive() || State::Instance().fgChanged) { - // LOG_TRACK("!State::Instance().currentFG->IsActive() || State::Instance().FGchanged"); + // LOG_TRACK("!State::Instance().currentFG->IsActive() || State::Instance().fgChanged"); return false; } @@ -586,8 +586,8 @@ bool Hudfix_Dx12::CheckForHudless(ID3D12GraphicsCommandList* cmdList, ResourceIn } CapturedHudlessInfo* capturedHudlessInfo = nullptr; - auto it = s.CapturedHudlesses.find(resource->buffer); - if (it != s.CapturedHudlesses.end()) + auto it = s.capturedHudlesses.find(resource->buffer); + if (it != s.capturedHudlesses.end()) { capturedHudlessInfo = &it->second; @@ -895,11 +895,11 @@ bool Hudfix_Dx12::CheckForHudless(ID3D12GraphicsCommandList* cmdList, ResourceIn } } - if (s.FGcaptureResources) + if (s.fgCaptureResources) { std::lock_guard lock(_captureMutex); _captureList.insert(resource->buffer); - s.FGcapturedResourceCount = _captureList.size(); + s.fgCapturedResourceCount = _captureList.size(); } LOG_DEBUG("Calling FG with hudless"); @@ -918,7 +918,7 @@ bool Hudfix_Dx12::CheckForHudless(ID3D12GraphicsCommandList* cmdList, ResourceIn } else { - s.CapturedHudlesses.insert_or_assign(resource->buffer, + s.capturedHudlesses.insert_or_assign(resource->buffer, CapturedHudlessInfo { 1, resource->captureInfo, true }); LOG_DEBUG("Inserted hudless info for {:X}", (size_t) resource->buffer); diff --git a/OptiScaler/inputs/FG/FSR3_Dx12_FG.cpp b/OptiScaler/inputs/FG/FSR3_Dx12_FG.cpp index b8c7712c..3c4c1d6e 100644 --- a/OptiScaler/inputs/FG/FSR3_Dx12_FG.cpp +++ b/OptiScaler/inputs/FG/FSR3_Dx12_FG.cpp @@ -705,7 +705,7 @@ static Fsr3::FfxErrorCode hkffxFsr3ConfigureFrameGeneration(void* context, Fsr3: { LOG_DEBUG("frameGenerationEnabled: {} ", config->frameGenerationEnabled); - s.FSRFGInputActive = config->frameGenerationEnabled; + s.fsrfgInputActive = config->frameGenerationEnabled; if (config->frameGenerationEnabled && !fg->IsActive() && Config::Instance()->FGEnabled.value_or_default()) { @@ -789,7 +789,7 @@ static Fsr3::FfxErrorCode hkffxSetFrameGenerationConfigToSwapchainDX12(Fsr3::Ffx { LOG_DEBUG("frameGenerationEnabled: {} ", config->frameGenerationEnabled); - s.FSRFGInputActive = config->frameGenerationEnabled; + s.fsrfgInputActive = config->frameGenerationEnabled; if (config->frameGenerationEnabled && !fg->IsActive() && Config::Instance()->FGEnabled.value_or_default()) { diff --git a/OptiScaler/inputs/FG/FfxApi_Dx12_FG.cpp b/OptiScaler/inputs/FG/FfxApi_Dx12_FG.cpp index 52a010f2..23b6a0b1 100644 --- a/OptiScaler/inputs/FG/FfxApi_Dx12_FG.cpp +++ b/OptiScaler/inputs/FG/FfxApi_Dx12_FG.cpp @@ -516,7 +516,7 @@ ffxReturnCode_t ffxConfigure_Dx12FG(ffxContext* context, ffxConfigureDescHeader* LOG_DEBUG("FFX_API_CONFIGURE_DESC_TYPE_FRAMEGENERATION frameID: {}, enabled: {}, fIndex: {} ", cDesc->frameID, cDesc->frameGenerationEnabled, fIndex); - s.FSRFGInputActive = cDesc->frameGenerationEnabled; + s.fsrfgInputActive = cDesc->frameGenerationEnabled; if (cDesc->frameGenerationEnabled && !fg->IsActive() && Config::Instance()->FGEnabled.value_or_default()) { diff --git a/OptiScaler/inputs/FG/Streamline_Inputs_Dx12.cpp b/OptiScaler/inputs/FG/Streamline_Inputs_Dx12.cpp index 1fce64da..a15375ef 100644 --- a/OptiScaler/inputs/FG/Streamline_Inputs_Dx12.cpp +++ b/OptiScaler/inputs/FG/Streamline_Inputs_Dx12.cpp @@ -274,7 +274,7 @@ bool Sl_Inputs_Dx12::evaluateState() if (repeatsInRow > 10 && fgOutput->IsActive()) { LOG_WARN("Many frame count repeats in a row, stopping FG"); - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; repeatsInRow = 0; return false; } @@ -285,7 +285,7 @@ bool Sl_Inputs_Dx12::evaluateState() bool Sl_Inputs_Dx12::reportResource(const sl::ResourceTag& tag, ID3D12GraphicsCommandList* cmdBuffer, uint32_t frameId) { auto& state = State::Instance(); - state.DLSSGLastFrame = state.FGLastFrame; + state.dlssgLastFrame = state.fgLastFrame; auto fgOutput = reinterpret_cast(state.currentFG); diff --git a/OptiScaler/inputs/FSR2_Dx11.cpp b/OptiScaler/inputs/FSR2_Dx11.cpp index 6dc90ae3..74682a45 100644 --- a/OptiScaler/inputs/FSR2_Dx11.cpp +++ b/OptiScaler/inputs/FSR2_Dx11.cpp @@ -214,7 +214,7 @@ static FfxErrorCode ffxFsr2ContextCreate_Dx11(FfxFsr2Context* context, FfxFsr2Co return ccResult; } - if (!state.NvngxDx11Inited) + if (!state.nvngxDx11Inited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; auto exePath = Util::ExePath().remove_filename(); diff --git a/OptiScaler/inputs/FSR2_Dx12.cpp b/OptiScaler/inputs/FSR2_Dx12.cpp index 2b291ac8..2f506c72 100644 --- a/OptiScaler/inputs/FSR2_Dx12.cpp +++ b/OptiScaler/inputs/FSR2_Dx12.cpp @@ -411,7 +411,7 @@ static Fsr212::FfxErrorCode ffxFsr2ContextCreate_Dx12(Fsr212::FfxFsr2Context* co return ccResult; } - if (!state.NvngxDx12Inited) + if (!state.nvngxDx12Inited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; auto exePath = Util::ExePath().remove_filename(); @@ -500,7 +500,7 @@ static Fsr212::FfxErrorCode ffxFsr2ContextCreate_Pattern_Dx12(Fsr212::FfxFsr2Con return ccResult; } - if (!state.NvngxDx12Inited) + if (!state.nvngxDx12Inited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; diff --git a/OptiScaler/inputs/FSR2_Vk.cpp b/OptiScaler/inputs/FSR2_Vk.cpp index b511cf37..4a348a39 100644 --- a/OptiScaler/inputs/FSR2_Vk.cpp +++ b/OptiScaler/inputs/FSR2_Vk.cpp @@ -336,7 +336,7 @@ static FfxErrorCode ffxFsr2ContextCreate_Vk(FfxFsr2Context* context, FfxFsr2Cont LOG_DEBUG("VkDevice: {:X}", (size_t) _vkDevice); } - if (!state.NvngxVkInited) + if (!state.nvngxVkInited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; auto exePath = Util::ExePath().remove_filename(); diff --git a/OptiScaler/inputs/FSR3_Dx12.cpp b/OptiScaler/inputs/FSR3_Dx12.cpp index 2b7f9535..2a614583 100644 --- a/OptiScaler/inputs/FSR3_Dx12.cpp +++ b/OptiScaler/inputs/FSR3_Dx12.cpp @@ -261,7 +261,7 @@ static Fsr3::FfxErrorCode ffxFsr3ContextCreate_Dx12(Fsr3::FfxFsr3UpscalerContext return ccResult; } - if (!state.NvngxDx12Inited) + if (!state.nvngxDx12Inited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; auto exePath = Util::ExePath().remove_filename(); @@ -465,7 +465,7 @@ ffxFsr3ContextCreate_Pattern_Dx12(Fsr3::FfxFsr3UpscalerContext* pContext, return ccResult; } - if (!state.NvngxDx12Inited) + if (!state.nvngxDx12Inited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; diff --git a/OptiScaler/inputs/FfxApiExe_Dx12.cpp b/OptiScaler/inputs/FfxApiExe_Dx12.cpp index 0450da30..69456641 100644 --- a/OptiScaler/inputs/FfxApiExe_Dx12.cpp +++ b/OptiScaler/inputs/FfxApiExe_Dx12.cpp @@ -200,7 +200,7 @@ static ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateConte if (!upscaleContext) return ffxApiResult; - if (!State::Instance().NvngxDx12Inited) + if (!State::Instance().nvngxDx12Inited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; auto exePath = Util::ExePath().remove_filename(); diff --git a/OptiScaler/inputs/FfxApi_Dx12.cpp b/OptiScaler/inputs/FfxApi_Dx12.cpp index f278075a..6105d82d 100644 --- a/OptiScaler/inputs/FfxApi_Dx12.cpp +++ b/OptiScaler/inputs/FfxApi_Dx12.cpp @@ -255,7 +255,7 @@ ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateContextDescH return ffxApiResult; } - if (!state.NvngxDx12Inited) + if (!state.nvngxDx12Inited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; auto exePath = Util::ExePath().remove_filename(); diff --git a/OptiScaler/inputs/FfxApi_Vk.cpp b/OptiScaler/inputs/FfxApi_Vk.cpp index 61cbab16..d9bd372f 100644 --- a/OptiScaler/inputs/FfxApi_Vk.cpp +++ b/OptiScaler/inputs/FfxApi_Vk.cpp @@ -395,7 +395,7 @@ ffxReturnCode_t ffxCreateContext_Vk(ffxContext* context, ffxCreateContextDescHea return ffxApiResult; } - if (!State::Instance().NvngxVkInited) + if (!State::Instance().nvngxVkInited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; auto exePath = Util::ExePath().remove_filename(); diff --git a/OptiScaler/inputs/NVNGX_DLSS_Dx11.cpp b/OptiScaler/inputs/NVNGX_DLSS_Dx11.cpp index 2bb1ba0d..46c54491 100644 --- a/OptiScaler/inputs/NVNGX_DLSS_Dx11.cpp +++ b/OptiScaler/inputs/NVNGX_DLSS_Dx11.cpp @@ -188,7 +188,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Init_Ext(unsigned long long InApp D3D11Device = InDevice; State::Instance().currentD3D11Device = InDevice; - State::Instance().NvngxDx11Inited = true; + State::Instance().nvngxDx11Inited = true; UpscalerTimeDx11::Init(InDevice); @@ -334,7 +334,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Shutdown() // HooksDx::UnHook(); shutdown = false; - State::Instance().NvngxDx11Inited = false; + State::Instance().nvngxDx11Inited = false; return NVSDK_NGX_Result_Success; } @@ -573,7 +573,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_CreateFeature(ID3D11DeviceContext D3D11Device->Release(); - State::Instance().AutoExposure.reset(); + State::Instance().autoExposure.reset(); if (deviceContext->ModuleLoaded() && deviceContext->Init(D3D11Device, InDevCtx, InParameters)) { diff --git a/OptiScaler/inputs/NVNGX_DLSS_Dx12.cpp b/OptiScaler/inputs/NVNGX_DLSS_Dx12.cpp index afb0f3e4..ca1f6dc4 100644 --- a/OptiScaler/inputs/NVNGX_DLSS_Dx12.cpp +++ b/OptiScaler/inputs/NVNGX_DLSS_Dx12.cpp @@ -180,7 +180,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_Ext(unsigned long long InApp } } - if (State::Instance().NvngxDx12Inited) + if (State::Instance().nvngxDx12Inited) { LOG_WARN("NVNGX already inited"); return NVSDK_NGX_Result_Success; @@ -205,7 +205,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_Ext(unsigned long long InApp UpscalerTimeDx12::Init(InDevice); - State::Instance().NvngxDx12Inited = true; + State::Instance().nvngxDx12Inited = true; UpscalerInputsDx12::Init(InDevice); @@ -247,7 +247,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init(unsigned long long InApplica } } - if (State::Instance().NvngxDx12Inited) + if (State::Instance().nvngxDx12Inited) { LOG_WARN("NVNGX already inited"); return NVSDK_NGX_Result_Success; @@ -313,7 +313,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_ProjectID(const char* InProj State::Instance().NVNGX_Engine = InEngineType; State::Instance().NVNGX_EngineVersion = std::string(InEngineVersion); - if (State::Instance().NvngxDx12Inited) + if (State::Instance().nvngxDx12Inited) { LOG_WARN("NVNGX already inited"); return NVSDK_NGX_Result_Success; @@ -340,7 +340,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_with_ProjectID( State::Instance().NVNGX_Engine = InEngineType; State::Instance().NVNGX_EngineVersion = std::string(InEngineVersion); - if (State::Instance().NvngxDx12Inited) + if (State::Instance().nvngxDx12Inited) { LOG_WARN("NVNGX already inited"); return NVSDK_NGX_Result_Success; @@ -358,7 +358,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_with_ProjectID( NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Shutdown(void) { shutdown = true; - State::Instance().NvngxDx12Inited = false; + State::Instance().nvngxDx12Inited = false; D3D12Device = nullptr; @@ -389,7 +389,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Shutdown(void) else State::Instance().currentFG->DestroyFGContext(); - State::Instance().ClearCapturedHudlesses = true; + State::Instance().clearCapturedHudlesses = true; } shutdown = false; @@ -400,7 +400,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Shutdown(void) Nvngx_FG::D3D12_Shutdown(); } - State::Instance().NvngxDx12Inited = false; + State::Instance().nvngxDx12Inited = false; return NVSDK_NGX_Result_Success; } @@ -408,7 +408,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Shutdown(void) NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Shutdown1(ID3D12Device* InDevice) { shutdown = true; - State::Instance().NvngxDx12Inited = false; + State::Instance().nvngxDx12Inited = false; if (State::Instance().activeFgInput == FGInput::NvngxFG || State::Instance().activeFgOutput == FGOutput::DLSSGWithNvngx) @@ -697,7 +697,7 @@ static NVSDK_NGX_Result TryCreateOptiFeature(ID3D12GraphicsCommandList* InCmdLis else (*OutHandle)->Id = handleId; - state.AutoExposure.reset(); + state.autoExposure.reset(); IFeature_Dx12* feature = Dx12Contexts[handleId].feature.get(); @@ -727,7 +727,7 @@ static NVSDK_NGX_Result TryCreateOptiFeature(ID3D12GraphicsCommandList* InCmdLis D3D12Hooks::SetRootSignatureTracking(true); - state.FGchanged = true; + state.fgChanged = true; return NVSDK_NGX_Result_Success; } @@ -820,13 +820,13 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_ReleaseFeature(NVSDK_NGX_Handle* return NVSDK_NGX_Result_Success; auto handleId = InHandle->Id; - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; // Clean up framegen if (State::Instance().currentFG != nullptr && State::Instance().activeFgInput == FGInput::Upscaler) { State::Instance().currentFG->DestroyFGContext(); - State::Instance().ClearCapturedHudlesses = true; + State::Instance().clearCapturedHudlesses = true; UpscalerInputsDx12::Reset(); } diff --git a/OptiScaler/inputs/NVNGX_DLSS_Vk.cpp b/OptiScaler/inputs/NVNGX_DLSS_Vk.cpp index 6841fd80..7ae24235 100644 --- a/OptiScaler/inputs/NVNGX_DLSS_Vk.cpp +++ b/OptiScaler/inputs/NVNGX_DLSS_Vk.cpp @@ -246,7 +246,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_Ext2( UpscalerTimeVk::Init(InDevice, InPD); - State::Instance().NvngxVkInited = true; + State::Instance().nvngxVkInited = true; return NVSDK_NGX_Result_Success; } @@ -879,7 +879,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_CreateFeature1(VkDevice InDevice else (*OutHandle)->Id = handleId; - State::Instance().AutoExposure.reset(); + State::Instance().autoExposure.reset(); { ScopedSkipSpoofing skipSpoofing; @@ -1102,7 +1102,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Shutdown(void) Nvngx_FG::VULKAN_Shutdown(); shutdown = false; - State::Instance().NvngxVkInited = false; + State::Instance().nvngxVkInited = false; return NVSDK_NGX_Result_Success; } diff --git a/OptiScaler/inputs/XeSS_Dx11.cpp b/OptiScaler/inputs/XeSS_Dx11.cpp index 5ff5e063..87a3f56b 100644 --- a/OptiScaler/inputs/XeSS_Dx11.cpp +++ b/OptiScaler/inputs/XeSS_Dx11.cpp @@ -100,7 +100,7 @@ xess_result_t hk_xessD3D11CreateContext(ID3D11Device* device, xess_context_handl if (device == nullptr) return XESS_RESULT_ERROR_DEVICE; - if (!State::Instance().NvngxDx11Inited) + if (!State::Instance().nvngxDx11Inited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; diff --git a/OptiScaler/inputs/XeSS_Dx12.cpp b/OptiScaler/inputs/XeSS_Dx12.cpp index eea21597..5d88efc2 100644 --- a/OptiScaler/inputs/XeSS_Dx12.cpp +++ b/OptiScaler/inputs/XeSS_Dx12.cpp @@ -101,7 +101,7 @@ xess_result_t hk_xessD3D12CreateContext(ID3D12Device* pDevice, xess_context_hand if (pDevice == nullptr) return XESS_RESULT_ERROR_DEVICE; - if (!State::Instance().NvngxDx12Inited) + if (!State::Instance().nvngxDx12Inited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; diff --git a/OptiScaler/inputs/XeSS_Vulkan.cpp b/OptiScaler/inputs/XeSS_Vulkan.cpp index 3286439f..579ca52d 100644 --- a/OptiScaler/inputs/XeSS_Vulkan.cpp +++ b/OptiScaler/inputs/XeSS_Vulkan.cpp @@ -129,7 +129,7 @@ xess_result_t hk_xessVKCreateContext(VkInstance instance, VkPhysicalDevice physi _physicalDevice = physicalDevice; _device = device; - if (!State::Instance().NvngxVkInited) + if (!State::Instance().nvngxVkInited) { NVSDK_NGX_FeatureCommonInfo fcInfo {}; auto exePath = Util::ExePath().remove_filename(); diff --git a/OptiScaler/menu/menu_common.cpp b/OptiScaler/menu/menu_common.cpp index b5152593..90fe0d7e 100644 --- a/OptiScaler/menu/menu_common.cpp +++ b/OptiScaler/menu/menu_common.cpp @@ -1792,7 +1792,7 @@ bool MenuCommon::RenderMenu() LOG_DEBUG("FG toggle key pressed, setting FGEnabled to {}", config->FGEnabled.value_or_default()); if (config->FGEnabled.value_or_default()) - state.FGchanged = true; + state.fgChanged = true; } } @@ -1820,12 +1820,12 @@ bool MenuCommon::RenderMenu() auto optiPath = std::filesystem::path(Config::Instance()->MainDllPath.value()); auto dllPath = optiPath / L"dlss-enabler-headless.dll"; - state.NvngxFgFilesAvailable = gExists.Get(dllPath); + state.nvngxFgFilesAvailable = gExists.Get(dllPath); - if (!state.NvngxFgFilesAvailable) + if (!state.nvngxFgFilesAvailable) { dllPath = optiPath / L"dlssg_to_fsr3_amd_is_better.dll"; - state.NvngxFgFilesAvailable = gExists.Get(dllPath); + state.nvngxFgFilesAvailable = gExists.Get(dllPath); } if (State::Instance().currentFeature != nullptr) @@ -2566,8 +2566,8 @@ bool MenuCommon::RenderMenu() if (windowTitle.empty()) { windowTitle = - StrFmt("%s - %s %s %s %s", VER_PRODUCT_NAME, state.GameExe.c_str(), - state.GameName.empty() ? "" : StrFmt("- %s", state.GameName.c_str()).c_str(), + StrFmt("%s - %s %s %s %s", VER_PRODUCT_NAME, state.gameExe.c_str(), + state.gameName.empty() ? "" : StrFmt("- %s", state.gameName.c_str()).c_str(), (state.detectedQuirks.size() > 0) ? "(Q)" : "", state.isOptiPatcherSucceed ? "(OP)" : ""); } @@ -3507,7 +3507,7 @@ bool MenuCommon::RenderMenu() else outputOptions[nvngxOutputIndex].label = "FSR3-FG via Nukem's"; } - if (!state.NvngxFgFilesAvailable) + if (!state.nvngxFgFilesAvailable) { inputOptions[nvngxInputIndex].set_disabled( true, "Missing dlssg_to_fsr3_amd_is_better.dll\nor dlss-enabler-headless.dll"); @@ -3524,7 +3524,7 @@ bool MenuCommon::RenderMenu() outputOptions[nvngxOutputIndex].set_disabled(nukemsUnsupportedApi, "Unsupported API"); auto constexpr DLSSGWithNvngxOutputIndex = (uint32_t) FGOutput::DLSSGWithNvngx; - if (!state.NvngxFgFilesAvailable) + if (!state.nvngxFgFilesAvailable) { outputOptions[DLSSGWithNvngxOutputIndex].set_disabled( true, "Missing the dlssg_to_fsr3_amd_is_better.dll file"); @@ -3716,7 +3716,7 @@ bool MenuCommon::RenderMenu() state.activeFgInput != FGInput::NoFG && state.activeFgInput != FGInput::NvngxFG) && fgOutput) { - ImGui::Checkbox("Show Detected UI", &state.FGHudlessCompare); + ImGui::Checkbox("Show Detected UI", &state.fgHudlessCompare); ShowHelpMarker("Needs HUDless texture to compare with final image.\n" "UI elements and ONLY UI elements should have a pink tint!"); @@ -3946,8 +3946,8 @@ bool MenuCommon::RenderMenu() if (ImGui::Button("Change FG") && _ffxFGIndex != config->FfxFGIndex.value_or_default()) { config->FfxFGIndex = _ffxFGIndex; - state.FGchanged = true; - state.SCchanged = true; + state.fgChanged = true; + state.scChanged = true; } } @@ -3958,7 +3958,7 @@ bool MenuCommon::RenderMenu() LOG_DEBUG("FGEnabled set FGEnabled: {}", fgActive); if (config->FGEnabled.value_or_default()) - state.FGchanged = true; + state.fgChanged = true; } ShowHelpMarker("Enable Frame Generation"); @@ -3969,8 +3969,8 @@ bool MenuCommon::RenderMenu() if (config->FGEnabled.value_or_default()) { - state.FGchanged = true; - state.SCchanged = true; + state.fgChanged = true; + state.scChanged = true; LOG_DEBUG("Async set FGChanged"); } } @@ -3986,7 +3986,7 @@ bool MenuCommon::RenderMenu() if (config->FGEnabled.value_or_default()) { - state.FGchanged = true; + state.fgChanged = true; LOG_DEBUG("DebugView set FGChanged"); } } @@ -4021,7 +4021,7 @@ bool MenuCommon::RenderMenu() ScopedIndent indent {}; ImGui::Spacing(); - ImGui::Checkbox("FG Only Generated", &state.FGonlyGenerated); + ImGui::Checkbox("FG Only Generated", &state.fgOnlyGenerated); ShowHelpMarker("Display only FSR 3.1 Generated frames"); ImGui::SameLine(0.0f, 16.0f); @@ -4105,7 +4105,7 @@ bool MenuCommon::RenderMenu() if (ImGui::Checkbox("Enable Tuning", &fptEnabled)) { config->FGFramePacingTuning = fptEnabled; - state.FSRFGFTPchanged = true; + state.fsrfgFramePaceTuningChanged = true; } ImGui::BeginDisabled(!config->FGFramePacingTuning.value_or_default()); @@ -4152,7 +4152,7 @@ bool MenuCommon::RenderMenu() ShowHelpMarker("Allows WaitForSingleObject instead of spinning for fence value"); if (ImGui::Button("Apply Timing Changes")) - state.FSRFGFTPchanged = true; + state.fsrfgFramePaceTuningChanged = true; ImGui::EndDisabled(); ImGui::TreePop(); @@ -4242,7 +4242,7 @@ bool MenuCommon::RenderMenu() LOG_DEBUG("Enabled set FGEnabled: {}", fgActive); if (config->FGEnabled.value_or_default()) - state.FGchanged = true; + state.fgChanged = true; } ShowHelpMarker("Enable Frame Generation"); @@ -4266,7 +4266,7 @@ bool MenuCommon::RenderMenu() if (ImGui::Selectable(intModes[i], (currentSet == i))) { LOG_DEBUG("XeFG Interpolation Count set to: {}", i + 1); - state.FGchanged = true; + state.fgChanged = true; config->FGXeFGInterpolationCount = i + 1; } } @@ -4298,7 +4298,7 @@ bool MenuCommon::RenderMenu() if (config->FGXeFGDebugView.value_or_default()) { - state.FGchanged = true; + state.fgChanged = true; LOG_DEBUG("DebugView set FGChanged"); } } @@ -4319,7 +4319,7 @@ bool MenuCommon::RenderMenu() // Disable this for now // ImGui::SameLine(0.0f, 16.0f); - // ImGui::Checkbox("Only Generated##2", &state.FGonlyGenerated); + // ImGui::Checkbox("Only Generated##2", &state.fgOnlyGenerated); // ShowHelpMarker("Display only XeFG generated frames"); ImGui::Spacing(); @@ -4400,7 +4400,7 @@ bool MenuCommon::RenderMenu() LOG_DEBUG("Enabled set FGEnabled: {}", fgActive); if (config->FGEnabled.value_or_default()) - state.FGchanged = true; + state.fgChanged = true; } ShowHelpMarker("Enable Frame Generation"); @@ -4504,8 +4504,8 @@ bool MenuCommon::RenderMenu() { config->FGHUDFix = fgHudfix; LOG_DEBUG("Enabled set FGHUDFix: {}", fgHudfix); - state.ClearCapturedHudlesses = true; - state.FGchanged = true; + state.clearCapturedHudlesses = true; + state.fgChanged = true; } ShowHelpMarker("Enable HUD stability fix, might cause crashes!"); @@ -4607,28 +4607,28 @@ bool MenuCommon::RenderMenu() "Helps games which use black borders for some \n" "resolutions and screen ratios (e.g. Witcher 3)"); - ImGui::BeginDisabled(state.FGresetCapturedResources); + ImGui::BeginDisabled(state.fgResetCapturedResources); ImGui::PushItemWidth(95.0f * menuResScale); - if (ImGui::Checkbox("FG Create List", &state.FGcaptureResources)) + if (ImGui::Checkbox("FG Create List", &state.fgCaptureResources)) { - if (!state.FGcaptureResources) + if (!state.fgCaptureResources) config->FGHUDLimit = 1; else - state.FGonlyUseCapturedResources = false; + state.fgOnlyUseCapturedResources = false; } ImGui::SameLine(0.0f, 16.0f); - if (ImGui::Checkbox("FG Use List", &state.FGonlyUseCapturedResources)) + if (ImGui::Checkbox("FG Use List", &state.fgOnlyUseCapturedResources)) { - if (state.FGcaptureResources) + if (state.fgCaptureResources) { - state.FGcaptureResources = false; + state.fgCaptureResources = false; config->FGHUDLimit = 1; } } ImGui::SameLine(0.0f, 8.0f); - ImGui::Text("(%d)", state.FGcapturedResourceCount); + ImGui::Text("(%d)", state.fgCapturedResourceCount); ImGui::PopItemWidth(); @@ -4638,8 +4638,8 @@ bool MenuCommon::RenderMenu() { LOG_DEBUG("Resetting captured resource list"); - state.FGresetCapturedResources = true; - state.FGonlyUseCapturedResources = false; + state.fgResetCapturedResources = true; + state.fgOnlyUseCapturedResources = false; } ImGui::EndDisabled(); @@ -4800,7 +4800,7 @@ bool MenuCommon::RenderMenu() "Select DLSS-FG in-game"); } - if (!state.NvngxFgFilesAvailable) + if (!state.nvngxFgFilesAvailable) { ImGui::TextColored(ImVec4(1.f, 0.f, 0.f, 1.f), "Please put dlssg_to_fsr3_amd_is_better.dll or " "dlss-enabler-headless.dll next to OptiScaler"); @@ -4940,20 +4940,20 @@ bool MenuCommon::RenderMenu() if (Nvngx_FG::is120orNewer()) { - if (ImGui::Checkbox("Enable Debug View", &state.DLSSGDebugView)) + if (ImGui::Checkbox("Enable Debug View", &state.dlssgDebugView)) { - Nvngx_FG::setDebugView(state.DLSSGDebugView); + Nvngx_FG::setDebugView(state.dlssgDebugView); } - if (ImGui::Checkbox("Interpolated frames only", &state.DLSSGInterpolatedOnly)) + if (ImGui::Checkbox("Interpolated frames only", &state.dlssgInterpolatedOnly)) { - Nvngx_FG::setInterpolatedOnly(state.DLSSGInterpolatedOnly); + Nvngx_FG::setInterpolatedOnly(state.dlssgInterpolatedOnly); } } else if (Nvngx_FG::FSRDebugView() != nullptr) { - if (ImGui::Checkbox("Enable Debug View", &state.DLSSGDebugView)) + if (ImGui::Checkbox("Enable Debug View", &state.dlssgDebugView)) { - Nvngx_FG::FSRDebugView()(state.DLSSGDebugView); + Nvngx_FG::FSRDebugView()(state.dlssgDebugView); } } } @@ -4971,7 +4971,7 @@ bool MenuCommon::RenderMenu() { ImGui::Text("Current FSR-FG state:"); ImGui::SameLine(); - if (state.FSRFGInputActive) + if (state.fsrfgInputActive) { if (fgOutput->IsActive()) ImGui::TextColored(ImVec4(0.f, 1.f, 0.25f, 1.f), "ON"); @@ -5017,7 +5017,7 @@ bool MenuCommon::RenderMenu() { ImGui::Text("Current Streamline FG state:"); ImGui::SameLine(); - if ((state.FGLastFrame - state.DLSSGLastFrame) < 3) + if ((state.fgLastFrame - state.dlssgLastFrame) < 3) { if (fgOutput->IsActive()) ImGui::TextColored(ImVec4(0.f, 1.f, 0.25f, 1.f), "ON"); @@ -7321,7 +7321,7 @@ bool MenuCommon::RenderMenu() ankerl::unordered_dense::map::iterator it; - for (it = state.CapturedHudlesses.begin(); it != state.CapturedHudlesses.end(); it++) + for (it = state.capturedHudlesses.begin(); it != state.capturedHudlesses.end(); it++) { ImGui::TableNextRow(); @@ -7356,7 +7356,7 @@ bool MenuCommon::RenderMenu() if (ImGui::Button("Clear##4")) { LOG_DEBUG("Clearing captured hudless resources"); - state.ClearCapturedHudlesses = true; + state.clearCapturedHudlesses = true; } ImGui::SameLine(0.0f, 8.0f); diff --git a/OptiScaler/menu/menu_overlay_dx.cpp b/OptiScaler/menu/menu_overlay_dx.cpp index d6277cb7..2035f3bf 100644 --- a/OptiScaler/menu/menu_overlay_dx.cpp +++ b/OptiScaler/menu/menu_overlay_dx.cpp @@ -514,7 +514,7 @@ void MenuOverlayDx::CleanupRenderTarget(bool clearQueue, HWND hWnd) auto fg = State::Instance().currentFG; if (fg != nullptr && fg->FrameGenerationContext() != nullptr && fg->IsActive()) { - State::Instance().FGchanged = true; + State::Instance().fgChanged = true; fg->UpdateTarget(); fg->Deactivate(); } diff --git a/OptiScaler/proxies/IGDExt_Proxy.h b/OptiScaler/proxies/IGDExt_Proxy.h index 203b151e..0a16875f 100644 --- a/OptiScaler/proxies/IGDExt_Proxy.h +++ b/OptiScaler/proxies/IGDExt_Proxy.h @@ -210,8 +210,8 @@ class IGDExtProxy INTCExtensionAppInfo1 appInfo {}; - appInfo.pApplicationName = string_to_wstring(State::Instance().GameName.empty() ? State::Instance().GameExe - : State::Instance().GameName) + appInfo.pApplicationName = string_to_wstring(State::Instance().gameName.empty() ? State::Instance().gameExe + : State::Instance().gameName) .c_str(); appInfo.pApplicationName = L"Unreal Engine"; diff --git a/OptiScaler/resource_tracking/ResTrack_dx12.cpp b/OptiScaler/resource_tracking/ResTrack_dx12.cpp index b869dfea..ff31b16f 100644 --- a/OptiScaler/resource_tracking/ResTrack_dx12.cpp +++ b/OptiScaler/resource_tracking/ResTrack_dx12.cpp @@ -532,10 +532,10 @@ bool ResTrack_Dx12::IsHudFixActive() } if (State::Instance().currentFG == nullptr || State::Instance().currentFeature == nullptr || - State::Instance().FGchanged) + State::Instance().fgChanged) { LOG_TRACK("State::Instance().currentFG == nullptr || State::Instance().currentFeature == nullptr || " - "State::Instance().FGchanged"); + "State::Instance().fgChanged"); return false; } @@ -577,9 +577,9 @@ void ResTrack_Dx12::hkCreateRenderTargetView(ID3D12Device* This, ID3D12Resource* // force hdr for swapchain buffer if (pResource != nullptr && pDesc != nullptr && Config::Instance()->ForceHDR.value_or_default()) { - for (size_t i = 0; i < State::Instance().SCbuffers.size(); i++) + for (size_t i = 0; i < State::Instance().scBuffers.size(); i++) { - if (State::Instance().SCbuffers[i] == pResource) + if (State::Instance().scBuffers[i] == pResource) { if (Config::Instance()->UseHDR10.value_or_default()) pDesc->Format = DXGI_FORMAT_R10G10B10A2_UNORM; @@ -632,9 +632,9 @@ void ResTrack_Dx12::hkCreateShaderResourceView(ID3D12Device* This, ID3D12Resourc // force hdr for swapchain buffer if (pResource != nullptr && pDesc != nullptr && Config::Instance()->ForceHDR.value_or_default()) { - for (size_t i = 0; i < State::Instance().SCbuffers.size(); i++) + for (size_t i = 0; i < State::Instance().scBuffers.size(); i++) { - if (State::Instance().SCbuffers[i] == pResource) + if (State::Instance().scBuffers[i] == pResource) { if (Config::Instance()->UseHDR10.value_or_default()) pDesc->Format = DXGI_FORMAT_R10G10B10A2_UNORM; @@ -687,9 +687,9 @@ void ResTrack_Dx12::hkCreateUnorderedAccessView(ID3D12Device* This, ID3D12Resour { if (pResource != nullptr && pDesc != nullptr && Config::Instance()->ForceHDR.value_or_default()) { - for (size_t i = 0; i < State::Instance().SCbuffers.size(); i++) + for (size_t i = 0; i < State::Instance().scBuffers.size(); i++) { - if (State::Instance().SCbuffers[i] == pResource) + if (State::Instance().scBuffers[i] == pResource) { if (Config::Instance()->UseHDR10.value_or_default()) pDesc->Format = DXGI_FORMAT_R10G10B10A2_UNORM; @@ -974,7 +974,7 @@ ULONG ResTrack_Dx12::hkRelease(ID3D12Resource* This) { toClean = _trackedResources[This]; // Copy vector _trackedResources.erase(This); - State::Instance().CapturedHudlesses.erase(This); + State::Instance().capturedHudlesses.erase(This); } } diff --git a/OptiScaler/upscalers/FeatureProvider_Dx12.cpp b/OptiScaler/upscalers/FeatureProvider_Dx12.cpp index 80b83702..4fb6aade 100644 --- a/OptiScaler/upscalers/FeatureProvider_Dx12.cpp +++ b/OptiScaler/upscalers/FeatureProvider_Dx12.cpp @@ -117,8 +117,8 @@ bool FeatureProvider_Dx12::ChangeFeature(Upscaler upscaler, ID3D12Device* device if (state.currentFG != nullptr && state.currentFG->IsActive() && state.activeFgInput == FGInput::Upscaler) { state.currentFG->DestroyFGContext(); - state.FGchanged = true; - state.ClearCapturedHudlesses = true; + state.fgChanged = true; + state.clearCapturedHudlesses = true; } if (contextData->feature != nullptr) diff --git a/OptiScaler/upscalers/IFeature.cpp b/OptiScaler/upscalers/IFeature.cpp index 93db33bf..8164ca17 100644 --- a/OptiScaler/upscalers/IFeature.cpp +++ b/OptiScaler/upscalers/IFeature.cpp @@ -69,10 +69,10 @@ bool IFeature::SetInitParameters(NVSDK_NGX_Parameter* InParameters) } // First check state to prevent upscaler re-init loops - if (State::Instance().AutoExposure.has_value()) + if (State::Instance().autoExposure.has_value()) { - LOG_INFO("AutoExposure flag overrided by OptiScaler: {}", State::Instance().AutoExposure.value()); - _initFlags.AutoExposure = State::Instance().AutoExposure.value(); + LOG_INFO("AutoExposure flag overrided by OptiScaler: {}", State::Instance().autoExposure.value()); + _initFlags.AutoExposure = State::Instance().autoExposure.value(); } else if (Config::Instance()->AutoExposure.has_value()) { diff --git a/OptiScaler/upscalers/IFeature_Dx11wDx12.cpp b/OptiScaler/upscalers/IFeature_Dx11wDx12.cpp index a8c25257..50c3711c 100644 --- a/OptiScaler/upscalers/IFeature_Dx11wDx12.cpp +++ b/OptiScaler/upscalers/IFeature_Dx11wDx12.cpp @@ -535,7 +535,7 @@ bool IFeature_Dx11wDx12::ProcessDx11Textures(const NVSDK_NGX_Parameter* InParame else { LOG_WARN("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[Handle()->Id] = true; } } diff --git a/OptiScaler/upscalers/IFeature_VkwDx12.cpp b/OptiScaler/upscalers/IFeature_VkwDx12.cpp index 9a3e877e..d746fbdd 100644 --- a/OptiScaler/upscalers/IFeature_VkwDx12.cpp +++ b/OptiScaler/upscalers/IFeature_VkwDx12.cpp @@ -1069,7 +1069,7 @@ bool IFeature_VkwDx12::ProcessVulkanTextures(VkCommandBuffer InCmdList, const NV !NvVkResourceNotValid(paramExposure)) { LOG_WARN("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[Handle()->Id] = true; paramExposure = nullptr; } diff --git a/OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp b/OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp index 011ab866..2290185b 100644 --- a/OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp @@ -215,7 +215,7 @@ bool FFXFeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList, else { LOG_DEBUG("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[Handle()->Id] = true; return true; } diff --git a/OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp b/OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp index f22e451b..57096f11 100644 --- a/OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp @@ -349,7 +349,7 @@ bool FFXFeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* In else { LOG_DEBUG("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[Handle()->Id] = true; return true; } diff --git a/OptiScaler/upscalers/ffx/FFXFeature_VkOn12.cpp b/OptiScaler/upscalers/ffx/FFXFeature_VkOn12.cpp index 4bd3a077..5d56dab0 100644 --- a/OptiScaler/upscalers/ffx/FFXFeature_VkOn12.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature_VkOn12.cpp @@ -71,7 +71,7 @@ bool FFXFeatureVkOn12::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter if (InParameters->Get(NVSDK_NGX_Parameter_ExposureTexture, ¶mExpo) != NVSDK_NGX_Result_Success) { LOG_WARN("ExposureTexture does not exist, enabling AutoExposure!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; } } diff --git a/OptiScaler/upscalers/fsr2/FSR2Feature_Dx11.cpp b/OptiScaler/upscalers/fsr2/FSR2Feature_Dx11.cpp index 23125a0e..c5977232 100644 --- a/OptiScaler/upscalers/fsr2/FSR2Feature_Dx11.cpp +++ b/OptiScaler/upscalers/fsr2/FSR2Feature_Dx11.cpp @@ -433,7 +433,7 @@ bool FSR2FeatureDx11::Evaluate(ID3D11DeviceContext* InContext, NVSDK_NGX_Paramet else { LOG_DEBUG("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[Handle()->Id] = true; return true; } diff --git a/OptiScaler/upscalers/fsr2/FSR2Feature_Dx12.cpp b/OptiScaler/upscalers/fsr2/FSR2Feature_Dx12.cpp index e497c356..f380a026 100644 --- a/OptiScaler/upscalers/fsr2/FSR2Feature_Dx12.cpp +++ b/OptiScaler/upscalers/fsr2/FSR2Feature_Dx12.cpp @@ -173,7 +173,7 @@ bool FSR2FeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList, else { LOG_DEBUG("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[Handle()->Id] = true; return true; } diff --git a/OptiScaler/upscalers/fsr2/FSR2Feature_Vk.cpp b/OptiScaler/upscalers/fsr2/FSR2Feature_Vk.cpp index dda6f76a..efcbee08 100644 --- a/OptiScaler/upscalers/fsr2/FSR2Feature_Vk.cpp +++ b/OptiScaler/upscalers/fsr2/FSR2Feature_Vk.cpp @@ -283,7 +283,7 @@ bool FSR2FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* I else { LOG_DEBUG("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[Handle()->Id] = true; return true; } diff --git a/OptiScaler/upscalers/fsr2_212/FSR2Feature_Dx12_212.cpp b/OptiScaler/upscalers/fsr2_212/FSR2Feature_Dx12_212.cpp index 30615876..a3bd68ff 100644 --- a/OptiScaler/upscalers/fsr2_212/FSR2Feature_Dx12_212.cpp +++ b/OptiScaler/upscalers/fsr2_212/FSR2Feature_Dx12_212.cpp @@ -174,7 +174,7 @@ bool FSR2FeatureDx12_212::EvaluateInternal(ID3D12GraphicsCommandList* InCommandL else { LOG_DEBUG("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[Handle()->Id] = true; return true; } diff --git a/OptiScaler/upscalers/fsr2_212/FSR2Feature_VkOnDx12_212.cpp b/OptiScaler/upscalers/fsr2_212/FSR2Feature_VkOnDx12_212.cpp index 477658b6..e3d767c2 100644 --- a/OptiScaler/upscalers/fsr2_212/FSR2Feature_VkOnDx12_212.cpp +++ b/OptiScaler/upscalers/fsr2_212/FSR2Feature_VkOnDx12_212.cpp @@ -169,7 +169,7 @@ bool FSR2FeatureVkOnDx12_212::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Pa if (InParameters->Get(NVSDK_NGX_Parameter_ExposureTexture, ¶mExpo) != NVSDK_NGX_Result_Success) { LOG_WARN("ExposureTexture does not exist, enabling AutoExposure!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; } } diff --git a/OptiScaler/upscalers/fsr2_212/FSR2Feature_Vk_212.cpp b/OptiScaler/upscalers/fsr2_212/FSR2Feature_Vk_212.cpp index bcaa2803..e03023ce 100644 --- a/OptiScaler/upscalers/fsr2_212/FSR2Feature_Vk_212.cpp +++ b/OptiScaler/upscalers/fsr2_212/FSR2Feature_Vk_212.cpp @@ -310,7 +310,7 @@ bool FSR2FeatureVk212::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter else { LOG_DEBUG("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[Handle()->Id] = true; return true; } diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp b/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp index 86be58ce..4f3cc211 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp +++ b/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp @@ -346,7 +346,7 @@ bool FSR31FeatureDx11::Evaluate(ID3D11DeviceContext* DeviceContext, NVSDK_NGX_Pa else { LOG_DEBUG("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[Handle()->Id] = true; return true; } diff --git a/OptiScaler/upscalers/xess/XeSSFeature_Dx12.cpp b/OptiScaler/upscalers/xess/XeSSFeature_Dx12.cpp index fdd3ba55..644a5dd9 100644 --- a/OptiScaler/upscalers/xess/XeSSFeature_Dx12.cpp +++ b/OptiScaler/upscalers/xess/XeSSFeature_Dx12.cpp @@ -190,7 +190,7 @@ bool XeSSFeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList, else { LOG_WARN("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[_handle->Id] = true; return true; } diff --git a/OptiScaler/upscalers/xess/XeSSFeature_Vk.cpp b/OptiScaler/upscalers/xess/XeSSFeature_Vk.cpp index 5eb81266..05374173 100644 --- a/OptiScaler/upscalers/xess/XeSSFeature_Vk.cpp +++ b/OptiScaler/upscalers/xess/XeSSFeature_Vk.cpp @@ -405,7 +405,7 @@ bool XeSSFeature_Vk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* else { LOG_WARN("AutoExposure disabled but ExposureTexture is not exist, it may cause problems!!"); - State::Instance().AutoExposure = true; + State::Instance().autoExposure = true; State::Instance().changeBackend[_handle->Id] = true; return true; } diff --git a/OptiScaler/wrapped/wrapped_swapchain.cpp b/OptiScaler/wrapped/wrapped_swapchain.cpp index eb180a3e..d727cfdf 100644 --- a/OptiScaler/wrapped/wrapped_swapchain.cpp +++ b/OptiScaler/wrapped/wrapped_swapchain.cpp @@ -337,9 +337,9 @@ static HRESULT LocalPresent(IDXGISwapChain* pSwapChain, UINT SyncInterval, UINT static UINT64 fgPresentFrame = 0; auto fgIsActive = fg != nullptr && fg->IsActive() && !fg->IsPaused(); - if (State::Instance().FGPresentIsCalled) + if (State::Instance().fgPresentIsCalled) { - State::Instance().FGPresentIsCalled = false; + State::Instance().fgPresentIsCalled = false; fgPresentFrame = _frameCounter; } @@ -717,14 +717,14 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGISwapChain4::ResizeBuffers(UINT BufferCount if (Config::Instance()->FGEnabled.value_or_default()) { - State::Instance().FGresetCapturedResources = true; - State::Instance().FGonlyUseCapturedResources = false; - State::Instance().FGchanged = true; + State::Instance().fgResetCapturedResources = true; + State::Instance().fgOnlyUseCapturedResources = false; + State::Instance().fgChanged = true; } MenuOverlayDx::CleanupRenderTarget(true, _handle); - State::Instance().SCchanged = true; + State::Instance().scChanged = true; if (Config::Instance()->OverrideVsync.value_or_default() && !State::Instance().SCExclusiveFullscreen && State::Instance().currentFG == nullptr) @@ -877,7 +877,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGISwapChain4::ResizeBuffers(UINT BufferCount } while (false); } - State::Instance().SCbuffers.clear(); + State::Instance().scBuffers.clear(); UINT bc = BufferCount; if (bc == 0 && _real1 != nullptr) { @@ -893,7 +893,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGISwapChain4::ResizeBuffers(UINT BufferCount if (_real->GetBuffer(i, IID_PPV_ARGS(&buffer)) == S_OK) { - State::Instance().SCbuffers.push_back(buffer); + State::Instance().scBuffers.push_back(buffer); buffer->Release(); } } @@ -1096,14 +1096,14 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGISwapChain4::ResizeBuffers1(UINT BufferCoun if (Config::Instance()->FGEnabled.value_or_default()) { - State::Instance().FGresetCapturedResources = true; - State::Instance().FGonlyUseCapturedResources = false; - State::Instance().FGchanged = true; + State::Instance().fgResetCapturedResources = true; + State::Instance().fgOnlyUseCapturedResources = false; + State::Instance().fgChanged = true; } MenuOverlayDx::CleanupRenderTarget(true, _handle); - State::Instance().SCchanged = true; + State::Instance().scChanged = true; if (Config::Instance()->OverrideVsync.value_or_default() && !State::Instance().SCExclusiveFullscreen && State::Instance().currentFG == nullptr) @@ -1276,7 +1276,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGISwapChain4::ResizeBuffers1(UINT BufferCoun } while (false); } - State::Instance().SCbuffers.clear(); + State::Instance().scBuffers.clear(); UINT bc = BufferCount; if (bc == 0 && _real1 != nullptr) { @@ -1292,7 +1292,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGISwapChain4::ResizeBuffers1(UINT BufferCoun if (_real->GetBuffer(i, IID_PPV_ARGS(&buffer)) == S_OK) { - State::Instance().SCbuffers.push_back(buffer); + State::Instance().scBuffers.push_back(buffer); buffer->Release(); } }