diff --git a/extern/Streamline-DX12 b/extern/Streamline-DX12 index b998246a3d..348ae90b95 160000 --- a/extern/Streamline-DX12 +++ b/extern/Streamline-DX12 @@ -1 +1 @@ -Subproject commit b998246a3d499c08765c5681b229c9e6b4513348 +Subproject commit 348ae90b95f37e7f7b7a81296589fdfc6a5b15b9 diff --git a/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_framegeneration_dx12.dll b/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_framegeneration_dx12.dll index c1375d709c..9251300bda 100644 Binary files a/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_framegeneration_dx12.dll and b/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_framegeneration_dx12.dll differ diff --git a/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_framegeneration_dx12.pdb b/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_framegeneration_dx12.pdb new file mode 100644 index 0000000000..b3116b9994 Binary files /dev/null and b/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_framegeneration_dx12.pdb differ diff --git a/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_loader_dx12.dll b/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_loader_dx12.dll index c8328190d8..650499e7ac 100644 Binary files a/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_loader_dx12.dll and b/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_loader_dx12.dll differ diff --git a/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_loader_dx12.pdb b/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_loader_dx12.pdb new file mode 100644 index 0000000000..08088c36f4 Binary files /dev/null and b/features/Upscaling/Shaders/Upscaling/FidelityFX/amd_fidelityfx_loader_dx12.pdb differ diff --git a/features/Upscaling/Shaders/Upscaling/Streamline/nvngx_dlss.dll b/features/Upscaling/Shaders/Upscaling/Streamline/nvngx_dlss.dll index 45fa00d770..220fd1b9e5 100644 Binary files a/features/Upscaling/Shaders/Upscaling/Streamline/nvngx_dlss.dll and b/features/Upscaling/Shaders/Upscaling/Streamline/nvngx_dlss.dll differ diff --git a/features/Upscaling/Shaders/Upscaling/Streamline/sl.common.dll b/features/Upscaling/Shaders/Upscaling/Streamline/sl.common.dll index ac714d074f..15c380be99 100644 Binary files a/features/Upscaling/Shaders/Upscaling/Streamline/sl.common.dll and b/features/Upscaling/Shaders/Upscaling/Streamline/sl.common.dll differ diff --git a/features/Upscaling/Shaders/Upscaling/Streamline/sl.dlss.dll b/features/Upscaling/Shaders/Upscaling/Streamline/sl.dlss.dll index 8a4ffe0ebd..3334e22c8d 100644 Binary files a/features/Upscaling/Shaders/Upscaling/Streamline/sl.dlss.dll and b/features/Upscaling/Shaders/Upscaling/Streamline/sl.dlss.dll differ diff --git a/features/Upscaling/Shaders/Upscaling/Streamline/sl.interposer.dll b/features/Upscaling/Shaders/Upscaling/Streamline/sl.interposer.dll index 7b4ac01a20..245c1886a1 100644 Binary files a/features/Upscaling/Shaders/Upscaling/Streamline/sl.interposer.dll and b/features/Upscaling/Shaders/Upscaling/Streamline/sl.interposer.dll differ diff --git a/features/Upscaling/Shaders/Upscaling/Streamline/sl.nis.dll b/features/Upscaling/Shaders/Upscaling/Streamline/sl.nis.dll deleted file mode 100644 index 25553dc87d..0000000000 Binary files a/features/Upscaling/Shaders/Upscaling/Streamline/sl.nis.dll and /dev/null differ diff --git a/src/Features/Upscaling.cpp b/src/Features/Upscaling.cpp index 4e926af7e9..6a37d71a81 100644 --- a/src/Features/Upscaling.cpp +++ b/src/Features/Upscaling.cpp @@ -22,8 +22,7 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT( frameGenerationForceEnable, streamlineLogLevel, sharpnessFSR, - sharpnessDLSS, - DLSSPreset); + sharpnessDLSS); decltype(&D3D11CreateDeviceAndSwapChain) ptrD3D11CreateDeviceAndSwapChainUpscaling; @@ -215,12 +214,6 @@ void Upscaling::DrawSettings() ImGui::SliderFloat("Sharpness", &settings.sharpnessFSR, 0.0f, 1.0f, "%.1f"); } else if (upscaleMethod == UpscaleMethod::kDLSS) { ImGui::SliderFloat("Sharpness", &settings.sharpnessDLSS, 0.0f, 1.0f, "%.1f"); - - // VR DLSS preset selection - if (globals::game::isVR) { - const char* presets[] = { "F (Fast)", "J (Quality)", "K (Ultra)" }; - ImGui::SliderInt("DLSS Preset", (int*)&settings.DLSSPreset, 0, 2, presets[settings.DLSSPreset]); - } } } diff --git a/src/Features/Upscaling.h b/src/Features/Upscaling.h index 933e78f2bb..4a402f6ca1 100644 --- a/src/Features/Upscaling.h +++ b/src/Features/Upscaling.h @@ -57,7 +57,6 @@ struct Upscaling : Feature uint streamlineLogLevel = 0; // 0=Off, 1=Default, 2=Verbose float sharpnessFSR = 1.0f; float sharpnessDLSS = 1.0f; - uint DLSSPreset = 2; // VR-specific DLSS preset: 0=F, 1=J, 2=K }; Settings settings; diff --git a/src/Features/Upscaling/Streamline.cpp b/src/Features/Upscaling/Streamline.cpp index 88eb7ccf75..06b879f37b 100644 --- a/src/Features/Upscaling/Streamline.cpp +++ b/src/Features/Upscaling/Streamline.cpp @@ -285,27 +285,6 @@ void Streamline::SetDLSSOptions() dlssOptions.preExposure = 1.0f; dlssOptions.sharpness = 0.0f; - // Set DLSS preset based on VR mode - sl::DLSSPreset preset = sl::DLSSPreset::ePresetK; // Default - switch (globals::features::upscaling.settings.DLSSPreset) { - case 0: - preset = sl::DLSSPreset::ePresetF; - break; - case 1: - preset = sl::DLSSPreset::ePresetJ; - break; - case 2: - default: - preset = sl::DLSSPreset::ePresetK; - break; - } - - dlssOptions.dlaaPreset = preset; - dlssOptions.qualityPreset = preset; - dlssOptions.balancedPreset = preset; - dlssOptions.performancePreset = preset; - dlssOptions.ultraPerformancePreset = preset; - if (SL_FAILED(result, slDLSSSetOptions(viewport, dlssOptions))) { logger::critical("[Streamline] Could not enable DLSS"); }