lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-09-22 21:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverted dlss check for now

Browse Source
This commit is contained in:
cdozdil
2024-06-26 16:12:23 +03:00
parent 61404f7c15
commit beeeca324f
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/OptiScaler.vcxproj
+1 -1
View File
@@ -22,7 +22,7 @@
<VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{8d2b73fb-eecd-45ce-b8e5-335610462f58}</ProjectGuid>
<RootNamespace>CyberXeSS</RootNamespace>
<RootNamespace>OptiScaler</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
OptiScaler/backends/fsr2/FSR2Feature_Vk.h
-1
View File
@@ -1,5 +1,4 @@
#pragma once
#include <vulkan/vulkan.hpp>
#include "../../fsr2/include/ffx_fsr2.h"
OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h
-1
View File
@@ -1,5 +1,4 @@
#pragma once
#include <vulkan/vulkan.hpp>
#include "../../fsr2_212/include/ffx_fsr2.h"
OptiScaler/backends/xess/XeSSFeature.cpp
+3 -2
View File
@@ -1,13 +1,14 @@
#pragma once
#include "XeSSFeature.h"
#include "../../pch.h"
#include "../../Config.h"
#include "../../Util.h"
#include "../../detours/detours.h"
#include "XeSSFeature.h"
#include "../../d3dx/d3dx12.h"
inline void XeSSLogCallback(const char* Message, xess_logging_level_t Level)
{
spdlog::log((spdlog::level::level_enum)((int)Level + 1), "FeatureContext::LogCallback XeSS Runtime ({0})", Message);
OptiScaler/backends/xess/XeSSFeature_Dx12.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "../IFeature_Dx12.h"
#include "XeSSFeature.h"
#include <string>
class XeSSFeatureDx12 : public XeSSFeature, public IFeature_Dx12
{
OptiScaler/imgui/imgui_common.h
+5 -6
View File
@@ -4,7 +4,6 @@
#include "../Config.h"
#include "../Resource.h"
#include "../Logger.h"
#include "../NVNGX_Proxy.h"
#include "imgui/imgui.h"
#include "imgui/imgui_impl_win32.h"
@@ -598,7 +597,7 @@ public:
selectedUpscalerName = "FSR 2.2.1 w/Dx12";
else if (Config::Instance()->newBackend == "fsr21_12" || (Config::Instance()->newBackend == "" && *code == "fsr21_12"))
selectedUpscalerName = "FSR 2.1.2 w/Dx12";
else if (NVNGXProxy::IsNVNGXInited() && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
else if (Config::Instance()->DLSSEnabled.value_or(true) && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
selectedUpscalerName = "DLSS";
else
selectedUpscalerName = "XeSS w/Dx12";
@@ -617,7 +616,7 @@ public:
if (ImGui::Selectable("FSR 2.2.1 w/Dx12", *code == "fsr22_12"))
Config::Instance()->newBackend = "fsr22_12";
if (NVNGXProxy::IsNVNGXInited() && ImGui::Selectable("DLSS", *code == "dlss"))
if (Config::Instance()->DLSSEnabled.value_or(true) && ImGui::Selectable("DLSS", *code == "dlss"))
Config::Instance()->newBackend = "dlss";
ImGui::EndCombo();
@@ -632,7 +631,7 @@ public:
selectedUpscalerName = "FSR 2.1.2";
else if (Config::Instance()->newBackend == "fsr22" || (Config::Instance()->newBackend == "" && *code == "fsr22"))
selectedUpscalerName = "FSR 2.2.1";
else if (NVNGXProxy::IsNVNGXInited() && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
else if (Config::Instance()->DLSSEnabled.value_or(true) && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
selectedUpscalerName = "DLSS";
else
selectedUpscalerName = "XeSS";
@@ -648,7 +647,7 @@ public:
if (ImGui::Selectable("FSR 2.2.1", *code == "fsr22"))
Config::Instance()->newBackend = "fsr22";
if (NVNGXProxy::IsNVNGXInited() && ImGui::Selectable("DLSS", *code == "dlss"))
if (Config::Instance()->DLSSEnabled.value_or(true) && ImGui::Selectable("DLSS", *code == "dlss"))
Config::Instance()->newBackend = "dlss";
ImGui::EndCombo();
@@ -661,7 +660,7 @@ public:
if (Config::Instance()->newBackend == "fsr21" || (Config::Instance()->newBackend == "" && *code == "fsr21"))
selectedUpscalerName = "FSR 2.1.2";
else if (NVNGXProxy::IsNVNGXInited() && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
else if (Config::Instance()->DLSSEnabled.value_or(true) && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
selectedUpscalerName = "DLSS";
else
selectedUpscalerName = "FSR 2.2.1";