From b612ca3f6fe431079f680585ab668b8a33f6fe65 Mon Sep 17 00:00:00 2001 From: FakeMichau <49685661+FakeMichau@users.noreply.github.com> Date: Tue, 16 Jul 2024 18:52:45 +0200 Subject: [PATCH] Rename reactive mask variable --- OptiScaler/backends/IFeature.h | 4 ++-- OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp | 2 +- OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp | 4 ++-- OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp | 2 +- OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp | 2 +- OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp | 4 ++-- OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp | 2 +- OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp | 2 +- OptiScaler/backends/fsr31/FSR31Feature_Dx11On12.cpp | 4 ++-- OptiScaler/backends/fsr31/FSR31Feature_Dx12.cpp | 2 +- OptiScaler/backends/fsr31/FSR31Feature_Vk.cpp | 2 +- OptiScaler/backends/xess/XeSSFeature_Dx11.cpp | 2 +- OptiScaler/backends/xess/XeSSFeature_Dx12.cpp | 2 +- OptiScaler/imgui/imgui_common.h | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/OptiScaler/backends/IFeature.h b/OptiScaler/backends/IFeature.h index fc652f5b..5a1f0856 100644 --- a/OptiScaler/backends/IFeature.h +++ b/OptiScaler/backends/IFeature.h @@ -22,7 +22,7 @@ protected: bool _hasDepth = false; bool _hasMV = false; bool _hasTM = false; - bool _hasReactiveMask = false; + bool _accessToReactiveMask = false; bool _hasExposure = false; bool _hasOutput = false; int _initFlags = 0; @@ -69,7 +69,7 @@ public: bool HasDepth() const { return _hasDepth; } bool HasMV() const { return _hasMV; } bool HasTM() const { return _hasTM; } - bool HasReactiveMask() const { return _hasReactiveMask; } + bool AccessToReactiveMask() const { return _accessToReactiveMask; } bool HasExposure() const { return _hasExposure; } bool HasOutput() const { return _hasOutput; } int InitFlags() const { return _initFlags; } diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp index a895ea9c..5370da97 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp @@ -384,7 +384,7 @@ bool FSR2FeatureDx11::Evaluate(ID3D11DeviceContext* InContext, NVSDK_NGX_Paramet _hasMV = params.motionVectors.resource != nullptr; _hasExposure = params.exposure.resource != nullptr; _hasTM = params.transparencyAndComposition.resource != nullptr; - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; _hasOutput = params.output.resource != nullptr; float MVScaleX = 1.0f; diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp index 8d4fc00f..e775cbe4 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp @@ -73,7 +73,7 @@ bool FSR2FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_N ID3D11Resource* paramReactiveMask = nullptr; if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, ¶mReactiveMask) != NVSDK_NGX_Result_Success) InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, (void**)¶mReactiveMask); - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; if (!Config::Instance()->DisableReactiveMask.has_value()) { @@ -253,7 +253,7 @@ bool FSR2FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_N _hasMV = params.motionVectors.resource != nullptr; _hasExposure = params.exposure.resource != nullptr; _hasTM = params.transparencyAndComposition.resource != nullptr; - _hasReactiveMask = params.reactive.resource != nullptr; + _accessToReactiveMask = params.reactive.resource != nullptr; _hasOutput = params.output.resource != nullptr; #pragma endregion diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp index daf87a31..eb371e47 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp @@ -260,7 +260,7 @@ bool FSR2FeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_N _hasMV = params.motionVectors.resource != nullptr; _hasExposure = params.exposure.resource != nullptr; _hasTM = params.transparencyAndComposition.resource != nullptr; - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; _hasOutput = params.output.resource != nullptr; float MVScaleX = 1.0f; diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp index 2abffacb..f07374c7 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp @@ -290,7 +290,7 @@ bool FSR2FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* I _hasMV = params.motionVectors.resource != nullptr; _hasExposure = params.exposure.resource != nullptr; _hasTM = params.transparencyAndComposition.resource != nullptr; - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; _hasOutput = params.output.resource != nullptr; float MVScaleX = 1.0f; diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp index 17ac343c..ec791019 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp @@ -76,7 +76,7 @@ bool FSR2FeatureDx11on12_212::Evaluate(ID3D11DeviceContext* InDeviceContext, NVS ID3D11Resource* paramReactiveMask = nullptr; if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, ¶mReactiveMask) != NVSDK_NGX_Result_Success) InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, (void**)¶mReactiveMask); - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; if (!Config::Instance()->DisableReactiveMask.has_value()) { @@ -250,7 +250,7 @@ bool FSR2FeatureDx11on12_212::Evaluate(ID3D11DeviceContext* InDeviceContext, NVS _hasMV = params.motionVectors.resource != nullptr; _hasExposure = params.exposure.resource != nullptr; _hasTM = params.transparencyAndComposition.resource != nullptr; - _hasReactiveMask = params.reactive.resource != nullptr; + _accessToReactiveMask = params.reactive.resource != nullptr; _hasOutput = params.output.resource != nullptr; #pragma endregion diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp index fdeb4724..032d48bb 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp @@ -260,7 +260,7 @@ bool FSR2FeatureDx12_212::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVS _hasMV = params.motionVectors.resource != nullptr; _hasExposure = params.exposure.resource != nullptr; _hasTM = params.transparencyAndComposition.resource != nullptr; - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; _hasOutput = params.output.resource != nullptr; float MVScaleX = 1.0f; diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp index 84228333..ed69d7dc 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp @@ -285,7 +285,7 @@ bool FSR2FeatureVk212::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter _hasMV = params.motionVectors.resource != nullptr; _hasExposure = params.exposure.resource != nullptr; _hasTM = params.transparencyAndComposition.resource != nullptr; - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; _hasOutput = params.output.resource != nullptr; float MVScaleX = 1.0f; diff --git a/OptiScaler/backends/fsr31/FSR31Feature_Dx11On12.cpp b/OptiScaler/backends/fsr31/FSR31Feature_Dx11On12.cpp index bd9efc8a..b30b844a 100644 --- a/OptiScaler/backends/fsr31/FSR31Feature_Dx11On12.cpp +++ b/OptiScaler/backends/fsr31/FSR31Feature_Dx11On12.cpp @@ -112,7 +112,7 @@ bool FSR31FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_ ID3D11Resource* paramReactiveMask = nullptr; if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, ¶mReactiveMask) != NVSDK_NGX_Result_Success) InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, (void**)¶mReactiveMask); - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; if (!Config::Instance()->DisableReactiveMask.has_value()) { @@ -290,7 +290,7 @@ bool FSR31FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_ _hasMV = params.motionVectors.resource != nullptr; _hasExposure = params.exposure.resource != nullptr; _hasTM = params.transparencyAndComposition.resource != nullptr; - _hasReactiveMask = params.reactive.resource != nullptr; + _accessToReactiveMask = params.reactive.resource != nullptr; _hasOutput = params.output.resource != nullptr; #pragma endregion diff --git a/OptiScaler/backends/fsr31/FSR31Feature_Dx12.cpp b/OptiScaler/backends/fsr31/FSR31Feature_Dx12.cpp index 07b2cc3b..5d4ea0c1 100644 --- a/OptiScaler/backends/fsr31/FSR31Feature_Dx12.cpp +++ b/OptiScaler/backends/fsr31/FSR31Feature_Dx12.cpp @@ -301,7 +301,7 @@ bool FSR31FeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_ _hasMV = params.motionVectors.resource != nullptr; _hasExposure = params.exposure.resource != nullptr; _hasTM = params.transparencyAndComposition.resource != nullptr; - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; _hasOutput = params.output.resource != nullptr; float MVScaleX = 1.0f; diff --git a/OptiScaler/backends/fsr31/FSR31Feature_Vk.cpp b/OptiScaler/backends/fsr31/FSR31Feature_Vk.cpp index 90aa0674..390bb094 100644 --- a/OptiScaler/backends/fsr31/FSR31Feature_Vk.cpp +++ b/OptiScaler/backends/fsr31/FSR31Feature_Vk.cpp @@ -381,7 +381,7 @@ bool FSR31FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* _hasMV = params.motionVectors.resource != nullptr; _hasExposure = params.exposure.resource != nullptr; _hasTM = params.transparencyAndComposition.resource != nullptr; - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; _hasOutput = params.output.resource != nullptr; float MVScaleX = 1.0f; diff --git a/OptiScaler/backends/xess/XeSSFeature_Dx11.cpp b/OptiScaler/backends/xess/XeSSFeature_Dx11.cpp index a3d9f536..1890b78d 100644 --- a/OptiScaler/backends/xess/XeSSFeature_Dx11.cpp +++ b/OptiScaler/backends/xess/XeSSFeature_Dx11.cpp @@ -84,7 +84,7 @@ bool XeSSFeatureDx11::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_NGX_P ID3D11Resource* paramReactiveMask = nullptr; if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, ¶mReactiveMask) != NVSDK_NGX_Result_Success) InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, (void**)¶mReactiveMask); - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; if (!Config::Instance()->DisableReactiveMask.has_value()) { diff --git a/OptiScaler/backends/xess/XeSSFeature_Dx12.cpp b/OptiScaler/backends/xess/XeSSFeature_Dx12.cpp index 3dc35d50..1f94a490 100644 --- a/OptiScaler/backends/xess/XeSSFeature_Dx12.cpp +++ b/OptiScaler/backends/xess/XeSSFeature_Dx12.cpp @@ -265,7 +265,7 @@ bool XeSSFeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_N _hasOutput = params.pOutputTexture != nullptr; _hasDepth = params.pDepthTexture != nullptr; _hasExposure = params.pExposureScaleTexture != nullptr; - _hasReactiveMask = paramReactiveMask != nullptr; + _accessToReactiveMask = paramReactiveMask != nullptr; float MVScaleX = 1.0f; float MVScaleY = 1.0f; diff --git a/OptiScaler/imgui/imgui_common.h b/OptiScaler/imgui/imgui_common.h index 94f92ec7..2b902759 100644 --- a/OptiScaler/imgui/imgui_common.h +++ b/OptiScaler/imgui/imgui_common.h @@ -1534,7 +1534,7 @@ public: } ImGui::TableNextColumn(); - ImGui::BeginDisabled(!Config::Instance()->CurrentFeature->HasReactiveMask()); + ImGui::BeginDisabled(!Config::Instance()->CurrentFeature->AccessToReactiveMask()); if (bool rm = Config::Instance()->DisableReactiveMask.value_or(true); ImGui::Checkbox("Disable Reactive Mask", &rm)) { Config::Instance()->DisableReactiveMask = rm;