Skip to content

Commit beeeca3

Browse files
committed
reverted dlss check for now
1 parent 61404f7 commit beeeca3

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

Diff for: OptiScaler/OptiScaler.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<VCProjectVersion>16.0</VCProjectVersion>
2323
<Keyword>Win32Proj</Keyword>
2424
<ProjectGuid>{8d2b73fb-eecd-45ce-b8e5-335610462f58}</ProjectGuid>
25-
<RootNamespace>CyberXeSS</RootNamespace>
25+
<RootNamespace>OptiScaler</RootNamespace>
2626
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Diff for: OptiScaler/backends/fsr2/FSR2Feature_Vk.h

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma once
2-
#include <vulkan/vulkan.hpp>
32

43

54
#include "../../fsr2/include/ffx_fsr2.h"

Diff for: OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma once
2-
#include <vulkan/vulkan.hpp>
32

43

54
#include "../../fsr2_212/include/ffx_fsr2.h"

Diff for: OptiScaler/backends/xess/XeSSFeature.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#pragma once
2+
#include "XeSSFeature.h"
3+
24
#include "../../pch.h"
35
#include "../../Config.h"
46
#include "../../Util.h"
57

68
#include "../../detours/detours.h"
7-
8-
#include "XeSSFeature.h"
99
#include "../../d3dx/d3dx12.h"
1010

11+
1112
inline void XeSSLogCallback(const char* Message, xess_logging_level_t Level)
1213
{
1314
spdlog::log((spdlog::level::level_enum)((int)Level + 1), "FeatureContext::LogCallback XeSS Runtime ({0})", Message);

Diff for: OptiScaler/backends/xess/XeSSFeature_Dx12.h

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22
#include "../IFeature_Dx12.h"
33
#include "XeSSFeature.h"
4-
#include <string>
54

65
class XeSSFeatureDx12 : public XeSSFeature, public IFeature_Dx12
76
{

Diff for: OptiScaler/imgui/imgui_common.h

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "../Config.h"
55
#include "../Resource.h"
66
#include "../Logger.h"
7-
#include "../NVNGX_Proxy.h"
87

98
#include "imgui/imgui.h"
109
#include "imgui/imgui_impl_win32.h"
@@ -598,7 +597,7 @@ class ImGuiCommon
598597
selectedUpscalerName = "FSR 2.2.1 w/Dx12";
599598
else if (Config::Instance()->newBackend == "fsr21_12" || (Config::Instance()->newBackend == "" && *code == "fsr21_12"))
600599
selectedUpscalerName = "FSR 2.1.2 w/Dx12";
601-
else if (NVNGXProxy::IsNVNGXInited() && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
600+
else if (Config::Instance()->DLSSEnabled.value_or(true) && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
602601
selectedUpscalerName = "DLSS";
603602
else
604603
selectedUpscalerName = "XeSS w/Dx12";
@@ -617,7 +616,7 @@ class ImGuiCommon
617616
if (ImGui::Selectable("FSR 2.2.1 w/Dx12", *code == "fsr22_12"))
618617
Config::Instance()->newBackend = "fsr22_12";
619618

620-
if (NVNGXProxy::IsNVNGXInited() && ImGui::Selectable("DLSS", *code == "dlss"))
619+
if (Config::Instance()->DLSSEnabled.value_or(true) && ImGui::Selectable("DLSS", *code == "dlss"))
621620
Config::Instance()->newBackend = "dlss";
622621

623622
ImGui::EndCombo();
@@ -632,7 +631,7 @@ class ImGuiCommon
632631
selectedUpscalerName = "FSR 2.1.2";
633632
else if (Config::Instance()->newBackend == "fsr22" || (Config::Instance()->newBackend == "" && *code == "fsr22"))
634633
selectedUpscalerName = "FSR 2.2.1";
635-
else if (NVNGXProxy::IsNVNGXInited() && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
634+
else if (Config::Instance()->DLSSEnabled.value_or(true) && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
636635
selectedUpscalerName = "DLSS";
637636
else
638637
selectedUpscalerName = "XeSS";
@@ -648,7 +647,7 @@ class ImGuiCommon
648647
if (ImGui::Selectable("FSR 2.2.1", *code == "fsr22"))
649648
Config::Instance()->newBackend = "fsr22";
650649

651-
if (NVNGXProxy::IsNVNGXInited() && ImGui::Selectable("DLSS", *code == "dlss"))
650+
if (Config::Instance()->DLSSEnabled.value_or(true) && ImGui::Selectable("DLSS", *code == "dlss"))
652651
Config::Instance()->newBackend = "dlss";
653652

654653
ImGui::EndCombo();
@@ -661,7 +660,7 @@ class ImGuiCommon
661660

662661
if (Config::Instance()->newBackend == "fsr21" || (Config::Instance()->newBackend == "" && *code == "fsr21"))
663662
selectedUpscalerName = "FSR 2.1.2";
664-
else if (NVNGXProxy::IsNVNGXInited() && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
663+
else if (Config::Instance()->DLSSEnabled.value_or(true) && (Config::Instance()->newBackend == "dlss" || (Config::Instance()->newBackend == "" && *code == "dlss")))
665664
selectedUpscalerName = "DLSS";
666665
else
667666
selectedUpscalerName = "FSR 2.2.1";

0 commit comments

Comments
 (0)