feat(hdr): add initial HDR DLSS5 bridge adaptation

Author: konodiodaaaaa1

README.md

@@ -34,7 +34,7 @@ A fresh configuration includes the following modes and selects Lanczos by defaul
 | RTX Video VSR Ultra | Video, visual novels, and compressed images | NVIDIA RTX |
 | DLSSFG | Experimental x2/x3/x4 frame generation | NVIDIA RTX |
 | XeSSFG | Experimental cross-vendor x2 frame generation | Compatible Intel, NVIDIA, or AMD GPU |
-| DLSSNR | Same-resolution SDR AI filter | Supported NVIDIA RTX runtime |
+| DLSSNR | Same-resolution SDR AI filter; HDR bridge profile available | Supported NVIDIA RTX runtime |
 
 Users upgrading from an older build can import `ScalingModes-v0.5.7-experimental.json` from the Release on the Scaling Modes page. It only appends `DLSSFG`, `XeSSFG`, and `DLSSNR`; it does not remove or replace existing modes.
 
@@ -59,7 +59,9 @@ x3/x4 require sufficient display refresh capacity. If the generated target excee
 
 ### DLSSNR
 
-DLSSNR is a same-resolution SDR post-process and does not upscale. It may affect both game content and composed text or UI. HDR is not currently supported.
+DLSSNR is a same-resolution post-process and does not upscale. The regular mode uses an SDR R8 color buffer. For an HDR desktop, import `presets/ScalingModes-HDR-DLSS5.json` and select `HDR DLSS5 Bridge`; it uses `HDRToSDR -> FrameRate_Filter -> DLSSNR\\DLSSNR_AI_Filter -> SDRToHDR` so Windows HDR stays enabled while DLSSNR keeps its supported SDR contract.
+
+See [`docs/experimental/HDR-DLSS5-Bridge.md`](docs/experimental/HDR-DLSS5-Bridge.md) for the format bridge, reference-white tuning, and verification details.
 
 | Parameter | Range | Default | Description |
 | --- | --- | --- | --- |

README_ZH.md

@@ -34,7 +34,7 @@
 | RTX Video VSR Ultra | 视频、视觉小说和压缩画面增强 | NVIDIA RTX |
 | DLSSFG | 实验性 x2/x3/x4 帧生成 | NVIDIA RTX |
 | XeSSFG | 通用显卡实验性 x2 帧生成 | 兼容 Intel、NVIDIA 或 AMD GPU |
-| DLSSNR | 同分辨率 SDR AI 滤镜 | 支持运行时的 NVIDIA RTX |
+| DLSSNR | 同分辨率 SDR AI 滤镜；HDR 桥接模式可用 | 支持运行时的 NVIDIA RTX |
 
 旧版本用户可以在“缩放模式”页面导入 Release 附带的 `ScalingModes-v0.5.7-experimental.json`。该文件只追加 `DLSSFG`、`XeSSFG` 和 `DLSSNR`，不会删除或替换已有模式。
 
@@ -59,7 +59,9 @@ x3/x4 需要足够高的显示器刷新率。生成目标高于显示器刷新
 
 ### DLSSNR
 
-DLSSNR 是同分辨率 SDR 后处理，不负责放大。它可能同时改变游戏画面、文字和 UI；HDR 暂不支持。
+DLSSNR 是同分辨率后处理，不负责放大。普通模式使用 SDR R8 颜色缓冲；HDR 桌面请导入 `presets/ScalingModes-HDR-DLSS5.json` 中的 `HDR DLSS5 Bridge`。该模式按 `HDRToSDR -> FrameRate_Filter -> DLSSNR\\DLSSNR_AI_Filter -> SDRToHDR` 处理，保持 Windows HDR 开启，同时避开 DLSSNR 直接接收 FP16 scRGB 时的通道异常和过曝。
+
+完整的格式、白点参数和验证方法见 [`docs/experimental/HDR-DLSS5-Bridge.md`](docs/experimental/HDR-DLSS5-Bridge.md)。
 
 | 参数 | 范围 | 默认值 | 说明 |
 | --- | --- | --- | --- |

docs/experimental/HDR-DLSS5-Bridge.md

@@ -0,0 +1,29 @@
+# HDR + DLSS5 Bridge
+
+This experimental profile keeps Windows HDR enabled while running the DLSSNR/DLSS5 neural pass on its supported SDR color-buffer contract.
+
+## Effect order
+
+`HDRToSDR -> FrameRate_Filter -> DLSSNR\\DLSSNR_AI_Filter -> SDRToHDR`
+
+- `HDRToSDR` reads the `R16G16B16A16_FLOAT` scRGB capture and converts it to an `R8G8B8A8_UNORM` SDR buffer.
+- The SDR bridge uses a fixed `4.5x` reference-white scale for the tested display. This corresponds to `DISPLAYCONFIG_SDR_WHITE_LEVEL=4500` (360 nits).
+- `DLSSNR\\DLSSNR_AI_Filter` stays on the R8 input/output path. Direct FP16 DLSSNR produced invalid channel output on the test system.
+- `SDRToHDR` converts the processed SDR buffer back to FP16 scRGB for the HDR presenter.
+
+## Import
+
+Import `presets/ScalingModes-HDR-DLSS5.json` from Magpie's Scaling Modes page, then select `HDR DLSS5 Bridge` in the profile that uses `Graphics Capture (HDR)`.
+
+The profile is intended for HDR desktops where the captured SDR portions are visibly over-bright without normalization. The reference-white value is display-dependent; query `DISPLAYCONFIG_SDR_WHITE_LEVEL` when tuning another monitor.
+
+## Verification
+
+Search the log for:
+
+```text
+当前捕获模式: Graphics Capture (HDR)
+DLSSNR STATUS: Feature=18 ... result=0x1 success=...
+```
+
+The bridge was tested with a browser window on an RTX 4070 and Windows HDR enabled. Native HDR highlights are compressed into the SDR DLSS5 working range, then returned to the HDR desktop through the FP16 presenter.

presets/ScalingModes-HDR-DLSS5.json

@@ -0,0 +1,36 @@
+{
+  "scalingModes": [
+    {
+      "name": "HDR DLSS5 Bridge",
+      "effects": [
+        {
+          "name": "HDRToSDR"
+        },
+        {
+          "name": "FrameRate_Filter",
+          "parameters": {
+            "targetFrameRate": 60
+          }
+        },
+        {
+          "name": "DLSSNR\\DLSSNR_AI_Filter",
+          "parameters": {
+            "nrPreset": 0,
+            "style": 0,
+            "intensity": 1,
+            "localToneStrength": 1,
+            "localStructureStrength": 1,
+            "skinStructureStrength": -1,
+            "useAutoMask": 0,
+            "uiCorrection": 0,
+            "guidanceMode": 0,
+            "depthInferenceInterval": 4
+          }
+        },
+        {
+          "name": "SDRToHDR"
+        }
+      ]
+    }
+  ]
+}

scripts/Build-Release.ps1

@@ -200,6 +200,9 @@ if (!$SkipBuild) {
         "/p:PatchVersion=$($versionMatch.Groups[3].Value)",
         "/p:VersionString=$Version", "/p:CommitId=$shortCommit",
         "/p:PreferredToolArchitecture=x64",
+        "/p:WindowsSdkDir=D:\Windows Kits\10\",
+        "/p:SDKReferenceDirectoryRoot=D:\Windows Kits\10\Extension SDKs\",
+        "/p:SDKExtensionDirectoryRoot=D:\Windows Kits\10\Extension SDKs\",
         "/p:UseMultiToolTask=false", "/p:CL_MPCount=1",
         "/p:DisablePDB=true", "/p:ReproducibleBuild=true"
     )

src/Effects/Effects.vcxproj

@@ -51,6 +51,14 @@
       <FileType>Document</FileType>
       <DeploymentContent>true</DeploymentContent>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="HDRToSDR.hlsl">
+      <FileType>Document</FileType>
+      <DeploymentContent>true</DeploymentContent>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="SDRToHDR.hlsl">
+      <FileType>Document</FileType>
+      <DeploymentContent>true</DeploymentContent>
+    </CopyFileToFolders>
     <CopyFileToFolders Include="FrameRate_Filter.hlsl">
       <FileType>Document</FileType>
       <DeploymentContent>true</DeploymentContent>

src/Effects/HDRToSDR.hlsl

@@ -0,0 +1,30 @@
+//!MAGPIE EFFECT
+//!VERSION 4
+//!SORT_NAME HDR To SDR (HDR Capture Bridge)
+
+//!TEXTURE
+//!FORMAT R16G16B16A16_FLOAT
+Texture2D INPUT;
+
+//!TEXTURE
+//!FORMAT R8G8B8A8_UNORM
+Texture2D OUTPUT;
+
+//!SAMPLER
+//!FILTER POINT
+SamplerState sam;
+
+//!PASS 1
+//!STYLE PS
+//!IN INPUT
+//!OUT OUTPUT
+
+float Srgb(float x) {
+	return x <= 0.0031308 ? x * 12.92 : 1.055 * pow(x, 1.0 / 2.4) - 0.055;
+}
+
+float4 Pass1(float2 pos) {
+	const float sdrWhiteScale = 4.5;
+	float4 c = INPUT.SampleLevel(sam, pos, 0) / sdrWhiteScale;
+	return float4(Srgb(max(c.r, 0.0)), Srgb(max(c.g, 0.0)), Srgb(max(c.b, 0.0)), 1.0);
+}

src/Effects/SDRToHDR.hlsl

@@ -0,0 +1,30 @@
+//!MAGPIE EFFECT
+//!VERSION 4
+//!SORT_NAME SDR To HDR (HDR Capture Bridge)
+
+//!TEXTURE
+//!FORMAT R8G8B8A8_UNORM
+Texture2D INPUT;
+
+//!TEXTURE
+//!FORMAT R16G16B16A16_FLOAT
+Texture2D OUTPUT;
+
+//!SAMPLER
+//!FILTER POINT
+SamplerState sam;
+
+//!PASS 1
+//!STYLE PS
+//!IN INPUT
+//!OUT OUTPUT
+
+float Linear(float x) {
+	return x <= 0.04045 ? x / 12.92 : pow((x + 0.055) / 1.055, 2.4);
+}
+
+float4 Pass1(float2 pos) {
+	const float sdrWhiteScale = 4.5;
+	float4 c = INPUT.SampleLevel(sam, pos, 0);
+	return float4(Linear(c.r), Linear(c.g), Linear(c.b), 1.0) * sdrWhiteScale;
+}

src/Magpie.Core/AdaptivePresenter.cpp

@@ -7,12 +7,16 @@
 
 namespace Magpie {
 
+static bool IsHdrPresentation() noexcept {
+	return ScalingWindow::Get().Options().captureMethod == CaptureMethod::GraphicsCaptureHDR;
+}
+
 static bool ShouldLogPresentationDiagnostic(uint32_t count) noexcept {
 	return count <= 3 || count % 120 == 0;
 }
 
 bool AdaptivePresenter::_Initialize(HWND hwndAttach) noexcept {
-	if (ScalingWindow::Get().Options().IsDirectFlipDisabled()) {
+	if (ScalingWindow::Get().Options().IsDirectFlipDisabled() && !IsHdrPresentation()) {
 		// 禁用 DirectFlip 时始终使用 DirectComposition 呈现
 		if (!_ResizeDCompVisual(hwndAttach)) {
 			Logger::Get().Error("_ResizeDCompVisual 失败");
@@ -29,7 +33,7 @@ bool AdaptivePresenter::_Initialize(HWND hwndAttach) noexcept {
 	DXGI_SWAP_CHAIN_DESC1 sd{
 		.Width = (UINT)rendererSize.cx,
 		.Height = (UINT)rendererSize.cy,
-		.Format = DXGI_FORMAT_R8G8B8A8_UNORM,
+		.Format = IsHdrPresentation() ? DXGI_FORMAT_R16G16B16A16_FLOAT : DXGI_FORMAT_R8G8B8A8_UNORM,
 		.SampleDesc = {
 			.Count = 1
 		},
@@ -70,6 +74,10 @@ bool AdaptivePresenter::_Initialize(HWND hwndAttach) noexcept {
 		Logger::Get().Error("获取 IDXGISwapChain2 失败");
 		return false;
 	}
+	if (IsHdrPresentation()) {
+		hr = _dxgiSwapChain->SetColorSpace1(DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709);
+		if (FAILED(hr)) Logger::Get().ComWarn("SetColorSpace1(scRGB) 失败", hr);
+	}
 
 	uint32_t maximumFrameLatency = bufferCount - 1;
 	for (const EffectOption& effect : ScalingWindow::Get().Options().effects) {
@@ -103,6 +111,10 @@ bool AdaptivePresenter::_Initialize(HWND hwndAttach) noexcept {
 		Logger::Get().ComError("获取后缓冲区失败", hr);
 		return false;
 	}
+	if (IsHdrPresentation()) {
+		hr = _dxgiSwapChain->SetColorSpace1(DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709);
+		if (FAILED(hr)) Logger::Get().ComWarn("Resize 后设置 scRGB 色彩空间失败", hr);
+	}
 
 	hr = d3dDevice->CreateRenderTargetView(_backBuffer.get(), nullptr, _backBufferRtv.put());
 	if (FAILED(hr)) {
@@ -383,7 +395,7 @@ bool AdaptivePresenter::_ResizeDCompVisual(HWND hwndAttach) noexcept {
 		hr = _dcompDevice->CreateVirtualSurface(
 			(UINT)rendererSize.cx,
 			(UINT)rendererSize.cy,
-			DXGI_FORMAT_R8G8B8A8_UNORM,
+			IsHdrPresentation() ? DXGI_FORMAT_R16G16B16A16_FLOAT : DXGI_FORMAT_R8G8B8A8_UNORM,
 			DXGI_ALPHA_MODE_IGNORE,
 			_dcompSurface.put()
 		);

src/Magpie.Core/CompSwapchainPresenter.cpp

@@ -147,7 +147,8 @@ bool CompSwapchainPresenter::BeginFrame(
 		const SIZE rendererSize = Win32Helper::GetSizeOfRect(ScalingWindow::Get().RendererRect());
 
 		D3D11_TEXTURE2D_DESC desc{};
-		desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+		desc.Format = ScalingWindow::Get().Options().captureMethod == CaptureMethod::GraphicsCaptureHDR
+			? DXGI_FORMAT_R16G16B16A16_FLOAT : DXGI_FORMAT_R8G8B8A8_UNORM;
 		desc.SampleDesc.Count = 1;
 		desc.MipLevels = 1;
 		desc.ArraySize = 1;