From 3b5eb94cabb5d47287c77034a7959fa08a4eb55d Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 23 Apr 2026 01:19:57 +0200 Subject: [PATCH 1/9] Add Video Super Resolution for Xbox This commit introduces a high-quality upscaling pipeline for Xbox using the NVIDIA Image Scaling (NIS) algorithm. - Implement NIS (Nvidia Image Scaling) Shader algorthim to upscale with reconstruction algorithm. - Implement DirectX 11 capability checks for Half-Precision (FP16) shader support to optimize compute performance. - Add a user preference (Video Super Resolution) to toggle between NIS and standard rendering. - Add a new class VideoUpscaler to load and apply the shader to limit the changes in VideoRenderer - Add the video enhancement information to the overlay Ref: https://github.com/NVIDIAGameWorks/NVIDIAImageScaling --- .gitmodules | 3 + Pages/AppPage.xaml.cpp | 1 + Pages/HostSettingsPage.xaml | 51 +++---- State/ApplicationState.cpp | 2 + State/MoonlightHost.h | 10 ++ State/Stats.cpp | 56 ++++++-- State/Stats.h | 2 + State/StreamConfiguration.h | 1 + Streaming/StatsRenderer.cpp | 11 +- Streaming/VideoRenderer.cpp | 198 ++++++++++++++++++++++++-- Streaming/VideoRenderer.h | 8 ++ Streaming/VideoUpscaler.cpp | 229 ++++++++++++++++++++++++++++++ Streaming/VideoUpscaler.h | 56 ++++++++ moonlight-xbox-dx.vcxproj | 30 ++-- moonlight-xbox-dx.vcxproj.filters | 23 ++- third_party/NVIDIAImageScaling | 1 + 16 files changed, 624 insertions(+), 58 deletions(-) create mode 100644 Streaming/VideoUpscaler.cpp create mode 100644 Streaming/VideoUpscaler.h create mode 160000 third_party/NVIDIAImageScaling diff --git a/.gitmodules b/.gitmodules index 870562b1..1c9502a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "third_party/imgui"] path = third_party/imgui url = https://github.com/ocornut/imgui.git +[submodule "third_party/NVIDIAImageScaling"] + path = third_party/NVIDIAImageScaling + url = https://github.com/NVIDIAGameWorks/NVIDIAImageScaling.git diff --git a/Pages/AppPage.xaml.cpp b/Pages/AppPage.xaml.cpp index 2558f454..5fb63177 100644 --- a/Pages/AppPage.xaml.cpp +++ b/Pages/AppPage.xaml.cpp @@ -166,6 +166,7 @@ void AppPage::Connect(int appId) { config->audioConfig = host->AudioConfig; config->videoCodec = host->VideoCodec; config->playAudioOnPC = host->PlayAudioOnPC; + config->videoSuperResolution = host->VideoSuperResolution; config->enableHDR = host->EnableHDR; config->enableSOPS = host->EnableSOPS; config->framePacing = host->FramePacing; diff --git a/Pages/HostSettingsPage.xaml b/Pages/HostSettingsPage.xaml index ae0f31fa..d1a8fa19 100644 --- a/Pages/HostSettingsPage.xaml +++ b/Pages/HostSettingsPage.xaml @@ -40,6 +40,7 @@ + Resolution @@ -57,58 +58,60 @@ Bitrate (Kbps) - Audio Configuration - - Play Audio on Host PC - - Autostart - + Video Super Resolution + + Audio Configuration + + Play Audio on Host PC + + Autostart + - Video Codecs - + Video Codecs + - Enable HDR: + Enable HDR: + Name="HDR4KNote" Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2" Visibility="Collapsed"> HDR requires Xbox system resolution set to 4K. - Optimize host resolution: - + Optimize host resolution: + - Frame Pacing: - + Frame Pacing: + + Name="FramePacingImmediateDesc" Grid.Row="10" Grid.Column="2" Visibility="Collapsed"> Best for Xbox Series. Lowest latency. Renders frames at the incoming frame rate. + Name="FramePacingDisplayLockedDesc" Grid.Row="10" Grid.Column="2" Visibility="Collapsed"> Best for Xbox One. Locks rendering frame rate to refresh rate and evenly spaces frames. - Show performance stats: + Show performance stats: - Show performance graphs: + Show performance graphs: + Name="XboxOneGraphsNote" Grid.Row="12" Grid.Column="1" Grid.ColumnSpan="2" Visibility="Collapsed"> Graphs are unavailable on Xbox One when system resolution is set to 4K. - Other: - + Other: + diff --git a/State/ApplicationState.cpp b/State/ApplicationState.cpp index 611792ca..721e862d 100644 --- a/State/ApplicationState.cpp +++ b/State/ApplicationState.cpp @@ -44,6 +44,7 @@ Concurrency::task moonlight_xbox_dx::ApplicationState::Init() if (a.contains("autoStartID"))h->AutostartID = a["autoStartID"]; if (a.contains("computername")) h->ComputerName = Utils::StringFromStdString(a["computername"].get()); if (a.contains("playaudioonpc")) h->PlayAudioOnPC = a["playaudioonpc"].get(); + if (a.contains("video_super_resolution")) h->VideoSuperResolution = a["video_super_resolution"].get(); if (a.contains("enable_hdr")) h->EnableHDR = a["enable_hdr"].get(); if (a.contains("enable_sops")) h->EnableSOPS = a["enable_sops"].get(); if (a.contains("enable_stats")) h->EnableStats = a["enable_stats"].get(); @@ -104,6 +105,7 @@ Concurrency::task moonlight_xbox_dx::ApplicationState::UpdateFile() hostJson["framePacing"] = Utils::PlatformStringToStdString(host->FramePacing); hostJson["autoStartID"] = host->AutostartID; hostJson["playaudioonpc"] = host->PlayAudioOnPC; + hostJson["video_super_resolution"] = host->VideoSuperResolution; hostJson["enable_hdr"] = host->EnableHDR; hostJson["enable_sops"] = host->EnableSOPS; hostJson["enable_stats"] = host->EnableStats; diff --git a/State/MoonlightHost.h b/State/MoonlightHost.h index 52c2e126..d5633ce4 100644 --- a/State/MoonlightHost.h +++ b/State/MoonlightHost.h @@ -18,6 +18,7 @@ namespace moonlight_xbox_dx { bool loading = true; bool wolPolling = false; bool playAudioOnPC = false; + bool videoSuperResolution = false; MoonlightClient* client; int currentlyRunningAppId; int bitrate = 20000; @@ -249,6 +250,15 @@ namespace moonlight_xbox_dx { } } + property bool VideoSuperResolution + { + bool get() { return this->videoSuperResolution; } + void set(bool value) { + this->videoSuperResolution = value; + OnPropertyChanged("VideoSuperResolution"); + } + } + property bool EnableHDR { bool get() { return this->enableHDR; } diff --git a/State/Stats.cpp b/State/Stats.cpp index c41027f4..31a37096 100644 --- a/State/Stats.cpp +++ b/State/Stats.cpp @@ -3,6 +3,7 @@ #include "Utils.hpp" #include "../Plot/ImGuiPlots.h" #include "../Streaming/FFMpegDecoder.h" +#include "../State/StreamConfiguration.h" using namespace moonlight_xbox_dx; @@ -45,7 +46,12 @@ bool Stats::ShouldUpdateDisplay(DX::StepTimer const& timer, bool isVisible, char // Move this window into the last window slot and clear it for next window memcpy(&m_LastWndVideoStats, &m_ActiveWndVideoStats, sizeof(VIDEO_STATS)); + + // Preserve the scaleRatio which is set directly by the renderer and doesn't accumulate + float currentScaleRatio = m_ActiveWndVideoStats.scaleRatio; ZeroMemory(&m_ActiveWndVideoStats, sizeof(VIDEO_STATS)); + m_ActiveWndVideoStats.scaleRatio = currentScaleRatio; + m_ActiveWndVideoStats.measurementStartTimestamp = timer.GetTotalSeconds(); } @@ -149,6 +155,11 @@ void Stats::SubmitRenderStats(double preWaitTimeMs, double renderTimeMs, double m_ActiveWndVideoStats.totalPresentTimeUs += static_cast(presentTimeMs * 1000); } +void Stats::SubmitScaleRatio(float scaleRatio) { + std::lock_guard lock(m_mutex); + m_ActiveWndVideoStats.scaleRatio = scaleRatio; +} + /// private methods void Stats::addVideoStats(DX::StepTimer const& timer, VIDEO_STATS& src, VIDEO_STATS& dst) { @@ -167,6 +178,7 @@ void Stats::addVideoStats(DX::StepTimer const& timer, VIDEO_STATS& src, VIDEO_ST dst.totalPreWaitTimeUs += src.totalPreWaitTimeUs; dst.totalPresentTimeUs += src.totalPresentTimeUs; dst.totalPresentDisplayMs += src.totalPresentDisplayMs; + dst.scaleRatio = src.scaleRatio; if (dst.minHostProcessingLatency == 0) { dst.minHostProcessingLatency = src.minHostProcessingLatency; @@ -299,19 +311,37 @@ void Stats::formatVideoStats(DX::StepTimer const& timer, VIDEO_STATS& stats, cha double avgVideoMbps = m_bwTracker.GetAverageMbps(); double peakVideoMbps = m_bwTracker.GetPeakMbps(); - ret = snprintf(&output[offset], - length - offset, - "Bitrate: %.1f Mbps, Peak (%us): %.1f\n" - "Incoming frame rate from network: %.2f FPS\n" - "Decoding frame rate: %.2f FPS\n" - "Rendering frame rate: %.2f FPS (%s)\n", - avgVideoMbps, - m_bwTracker.GetWindowSeconds(), - peakVideoMbps, - stats.receivedFps, - stats.decodedFps, - stats.renderedFps, - Pacer::instance().getPacingImmediate() ? "immediate" : "display-locked"); + if (GetStreamConfig()->videoSuperResolution) { + ret = snprintf(&output[offset], + length - offset, + "Bitrate: %.1f Mbps, Peak (%us): %.1f\n" + "Video Enhancement: (x%.2f) NIS Shader\n" + "Incoming frame rate from network: %.2f FPS\n" + "Decoding frame rate: %.2f FPS\n" + "Rendering frame rate: %.2f FPS (%s)\n", + avgVideoMbps, + m_bwTracker.GetWindowSeconds(), + peakVideoMbps, + stats.scaleRatio, + stats.receivedFps, + stats.decodedFps, + stats.renderedFps, + Pacer::instance().getPacingImmediate() ? "immediate" : "display-locked"); + } else { + ret = snprintf(&output[offset], + length - offset, + "Bitrate: %.1f Mbps, Peak (%us): %.1f\n" + "Incoming frame rate from network: %.2f FPS\n" + "Decoding frame rate: %.2f FPS\n" + "Rendering frame rate: %.2f FPS (%s)\n", + avgVideoMbps, + m_bwTracker.GetWindowSeconds(), + peakVideoMbps, + stats.receivedFps, + stats.decodedFps, + stats.renderedFps, + Pacer::instance().getPacingImmediate() ? "immediate" : "display-locked"); + } if (ret < 0 || (size_t)ret >= (length - offset)) { Utils::Log("Error: stringifyVideoStats length overflow\n"); return; diff --git a/State/Stats.h b/State/Stats.h index 7419e919..d2609ad3 100644 --- a/State/Stats.h +++ b/State/Stats.h @@ -46,6 +46,7 @@ typedef struct _VIDEO_STATS { double decodedFps; double renderedFps; double measurementStartTimestamp; + float scaleRatio; } VIDEO_STATS, *PVIDEO_STATS; namespace moonlight_xbox_dx @@ -64,6 +65,7 @@ namespace moonlight_xbox_dx void SubmitPacerTime(int64_t pacerTimeQpc); void SubmitPresentPacing(double presentDisplayMs); void SubmitRenderStats(double preWaitTimeMs, double renderTimeMs, double presentTimeMs, bool hitDeadline); + void SubmitScaleRatio(float scaleRatio); private: void addVideoStats(DX::StepTimer const& timer, VIDEO_STATS& src, VIDEO_STATS& dst); diff --git a/State/StreamConfiguration.h b/State/StreamConfiguration.h index f0baa3c6..aa6887a6 100644 --- a/State/StreamConfiguration.h +++ b/State/StreamConfiguration.h @@ -17,6 +17,7 @@ namespace moonlight_xbox_dx property Platform::String^ framePacing; property bool enableHDR; property bool playAudioOnPC; + property bool videoSuperResolution; property bool enableVsync; property bool enableSOPS; property bool enableStats; diff --git a/Streaming/StatsRenderer.cpp b/Streaming/StatsRenderer.cpp index 4b9cb66d..8fd96c28 100644 --- a/Streaming/StatsRenderer.cpp +++ b/Streaming/StatsRenderer.cpp @@ -6,6 +6,7 @@ #include "../Plot/PlotDesc.h" #include "FFMpegDecoder.h" #include "Utils.hpp" +#include "../State/StreamConfiguration.h" using namespace DirectX; using namespace moonlight_xbox_dx; @@ -187,17 +188,19 @@ void StatsRenderer::CreateWindowSizeDependentResources() { int right = m_displayWidth / 3; int bottom = 0; - // 13 lines of text + // Check if Video Super Resolution is enabled to allocate space for 14 lines instead of 13 + bool isVSREnabled = GetStreamConfig() != nullptr && GetStreamConfig()->videoSuperResolution; + if (m_displayHeight >= 2160) { // 24pt font left = 20; right = m_displayWidth / 2; - bottom = 448; + bottom = isVSREnabled ? 483 : 448; // 14 lines (483) vs 13 lines (448) } else if (m_displayHeight >= 1440) { // 12pt font left = 14; - bottom = 224; + bottom = isVSREnabled ? 242 : 224; // 14 lines (242) vs 13 lines (224) } else { left = 10; - bottom = 224; + bottom = isVSREnabled ? 242 : 224; // 14 lines (242) vs 13 lines (224) } #if defined(_DEBUG) diff --git a/Streaming/VideoRenderer.cpp b/Streaming/VideoRenderer.cpp index 1f6c1e8d..dbbc6012 100644 --- a/Streaming/VideoRenderer.cpp +++ b/Streaming/VideoRenderer.cpp @@ -118,9 +118,58 @@ bool VideoRenderer::Render(AVFrame *frame) { D3D11_TEXTURE2D_DESC ffmpegDesc; ffmpegTexture->GetDesc(&ffmpegDesc); + // First, calculate the true destination size and offsets (to preserve aspect ratio and add black bars) + IRECT src, fsrDst; + src.x = src.y = 0; + src.w = configuration->width; + src.h = configuration->height; + + // FSR true pixel-based destination rect + fsrDst.x = fsrDst.y = 0; + fsrDst.w = m_deviceResources->GetPixelWidth(); + fsrDst.h = m_deviceResources->GetPixelHeight(); + scaleSourceToDestinationSurface(&src, &fsrDst); + bool hasChanged = hasFrameFormatChanged(frame); if (hasChanged) { setupVideoTexture(ffmpegDesc); + + // Set the correct format depending on whether HDR is active + DXGI_FORMAT renderFormat = m_deviceResources->GetBackBufferFormat(); + bool isHDR = (frame->color_trc == AVCOL_TRC_SMPTE2084); + + // Initialize the Upscaler to upscale exactly to the aspect-ratio-preserved dimensions in raw pixels + if (configuration->videoSuperResolution) { + if (!m_upscaler) { + m_upscaler = std::make_unique(m_deviceResources); + } + if (m_upscaler->Initialize(src.w, src.h, fsrDst.w, fsrDst.h, renderFormat, isHDR)) { + D3D11_TEXTURE2D_DESC texDesc = {}; + texDesc.Width = src.w; + texDesc.Height = src.h; + texDesc.MipLevels = 1; + texDesc.ArraySize = 1; + texDesc.Format = renderFormat; + texDesc.SampleDesc.Count = 1; + texDesc.Usage = D3D11_USAGE_DEFAULT; + texDesc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE; + + auto device = m_deviceResources->GetD3DDevice(); + HRESULT hr = device->CreateTexture2D(&texDesc, nullptr, m_intermediateTex.GetAddressOf()); + if (SUCCEEDED(hr)) { + device->CreateRenderTargetView(m_intermediateTex.Get(), nullptr, m_intermediateRTV.GetAddressOf()); + device->CreateShaderResourceView(m_intermediateTex.Get(), nullptr, m_intermediateSRV.GetAddressOf()); + } else { + m_upscaler.reset(); + } + } else { + m_upscaler.reset(); + } + } + + // Calculate and submit scale ratio using the raw pixel output height / stream height + float scaleRatio = (float)fsrDst.h / (float)frame->height; + m_deviceResources->GetStats()->SubmitScaleRatio(scaleRatio); } // SRV 0 is always mapped to the video texture @@ -142,6 +191,31 @@ bool VideoRenderer::Render(AVFrame *frame) { bindColorConversion(frame, ffmpegDesc); } + // Bind the render target: If VSR is enabled AND successfully initialized, use intermediate RTV + if (configuration->videoSuperResolution && m_intermediateRTV && m_upscaler) { + // Render the YUV->RGB pass into our intermediate texture at native stream resolution + ID3D11RenderTargetView* renderTarget[] = { m_intermediateRTV.Get() }; + ctx->OMSetRenderTargets(1, renderTarget, nullptr); + + // Set viewport to match the intermediate texture dimensions + D3D11_VIEWPORT vp; + vp.Width = (float)configuration->width; + vp.Height = (float)configuration->height; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + vp.TopLeftX = 0; + vp.TopLeftY = 0; + ctx->RSSetViewports(1, &vp); + } else { + // Render directly to the screen (backbuffer) + ID3D11RenderTargetView* renderTarget[] = { m_deviceResources->GetBackBufferRenderTargetView() }; + ctx->OMSetRenderTargets(1, renderTarget, nullptr); + + // Set viewport to match the screen + auto screenViewport = m_deviceResources->GetScreenViewport(); + ctx->RSSetViewports(1, &screenViewport); + } + UINT stride = sizeof(VERTEX); UINT offset = 0; ctx->IASetVertexBuffers(0, 1, m_VideoVertexBuffer.GetAddressOf(), &stride, &offset); @@ -152,13 +226,62 @@ bool VideoRenderer::Render(AVFrame *frame) { ctx->PSSetShaderResources(0, 2, frameSrvs); ctx->PSSetConstantBuffers(0, 1, m_cscConstantBuffer.GetAddressOf()); - // Draw the video + // Draw the video (YUV to RGB conversion) ctx->DrawIndexed(6, 0, 0); // Unbind SRVs for this frame ID3D11ShaderResourceView* nullSrvs[2] = {}; ctx->PSSetShaderResources(0, 2, nullSrvs); + // If Video Super Resolution is enabled, run the compute shaders + if (configuration->videoSuperResolution && m_upscaler && m_intermediateSRV) { + // Unbind the Render Target so we can use its SRV in the Compute Shader without D3D11 Hazard Tracking forcing it to NULL + ID3D11RenderTargetView* nullRTV[1] = { nullptr }; + ctx->OMSetRenderTargets(1, nullRTV, nullptr); + + // Run EASU and RCAS passes on the intermediate texture + ID3D11ShaderResourceView* finalSRV = m_upscaler->ProcessFrame(m_intermediateSRV.Get()); + + if (finalSRV) { + // Now we need to render the final upscaled texture to the actual backbuffer + ID3D11RenderTargetView* backBufferRTV[] = { m_deviceResources->GetBackBufferRenderTargetView() }; + ctx->OMSetRenderTargets(1, backBufferRTV, nullptr); + + // For simplicity and to ensure it displays, if m_upscaler gives us an SRV, we can retrieve its texture + // and copy it to the backbuffer if dimensions match. + Microsoft::WRL::ComPtr upscaledRes; + finalSRV->GetResource(upscaledRes.GetAddressOf()); + + Microsoft::WRL::ComPtr upscaledTex; + upscaledRes.As(&upscaledTex); + + if (upscaledTex) { + Microsoft::WRL::ComPtr backBufferRes; + backBufferRTV[0]->GetResource(backBufferRes.GetAddressOf()); + + Microsoft::WRL::ComPtr backBufferTex; + backBufferRes.As(&backBufferTex); + + D3D11_TEXTURE2D_DESC srcDesc, dstDesc, videoDesc; + upscaledTex->GetDesc(&srcDesc); + backBufferTex->GetDesc(&dstDesc); + m_VideoTexture->GetDesc(&videoDesc); + + static bool logged = false; + if (!logged) { + Utils::Logf("[Texture Sizes] Stream Input (m_VideoTexture): %dx%d | Upscaler Output (upscaledTex): %dx%d | Screen (BackBuffer): %dx%d\n", + videoDesc.Width, videoDesc.Height, + srcDesc.Width, srcDesc.Height, + dstDesc.Width, dstDesc.Height); + logged = true; + } + + // Copy the upscaled texture to the backbuffer, using calculated offsets for centering + ctx->CopySubresourceRegion(backBufferRes.Get(), 0, fsrDst.x, fsrDst.y, 0, upscaledTex.Get(), 0, nullptr); + } + } + } + if (frame->color_trc != m_LastColorTrc) { DXGI_COLOR_SPACE_TYPE colorspace = {}; @@ -384,14 +507,24 @@ void VideoRenderer::setupVertexBuffer(D3D11_TEXTURE2D_DESC frameDesc) src.x = src.y = 0; src.w = configuration->width; src.h = configuration->height; - dst.x = dst.y = 0; - dst.w = m_DisplayWidth; - dst.h = m_DisplayHeight; - scaleSourceToDestinationSurface(&src, &dst); - - // Convert screen space to normalized device coordinates + FRECT renderRect; - screenSpaceToNormalizedDeviceCoords(&dst, &renderRect, m_DisplayWidth, m_DisplayHeight); + + if (configuration->videoSuperResolution) { + // Output exactly to the native resolution texture for the FSR pass + renderRect.x = -1.0f; + renderRect.y = -1.0f; + renderRect.w = 2.0f; + renderRect.h = 2.0f; + } else { + dst.x = dst.y = 0; + dst.w = m_DisplayWidth; + dst.h = m_DisplayHeight; + scaleSourceToDestinationSurface(&src, &dst); + + // Convert screen space to normalized device coordinates + screenSpaceToNormalizedDeviceCoords(&dst, &renderRect, m_DisplayWidth, m_DisplayHeight); + } m_TextureWidth = frameDesc.Width; m_TextureHeight = frameDesc.Height; @@ -590,6 +723,55 @@ void VideoRenderer::getFrameChromaCositingOffsets(const AVFrame* frame, std::arr } } +void VideoRenderer::InitializeUpscaler(DXGI_FORMAT format, bool isHDR) { + if (!configuration->videoSuperResolution) return; + + if (!m_upscaler) { + m_upscaler = std::make_unique(m_deviceResources); + } + + // First, calculate the true destination size and offsets (to preserve aspect ratio and add black bars) + IRECT src, fsrDst; + src.x = src.y = 0; + src.w = configuration->width; + src.h = configuration->height; + + // FSR true pixel-based destination rect + fsrDst.x = fsrDst.y = 0; + fsrDst.w = m_deviceResources->GetPixelWidth(); + fsrDst.h = m_deviceResources->GetPixelHeight(); + scaleSourceToDestinationSurface(&src, &fsrDst); + + // Initialize the Upscaler to upscale exactly to the aspect-ratio-preserved dimensions in raw pixels + if (m_upscaler->Initialize(src.w, src.h, fsrDst.w, fsrDst.h, format, isHDR)) { + + // Create the intermediate texture that the pixel shader will render into (instead of the backbuffer) + D3D11_TEXTURE2D_DESC texDesc = {}; + texDesc.Width = configuration->width; + texDesc.Height = configuration->height; + texDesc.MipLevels = 1; + texDesc.ArraySize = 1; + texDesc.Format = format; // Match backbuffer format or HDR format + texDesc.SampleDesc.Count = 1; + texDesc.Usage = D3D11_USAGE_DEFAULT; + texDesc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE; + + auto device = m_deviceResources->GetD3DDevice(); + HRESULT hr = device->CreateTexture2D(&texDesc, nullptr, m_intermediateTex.GetAddressOf()); + if (SUCCEEDED(hr)) { + device->CreateRenderTargetView(m_intermediateTex.Get(), nullptr, m_intermediateRTV.GetAddressOf()); + device->CreateShaderResourceView(m_intermediateTex.Get(), nullptr, m_intermediateSRV.GetAddressOf()); + Utils::Log("VideoUpscaler initialized successfully.\n"); + } else { + Utils::Log("Failed to create intermediate texture for VideoUpscaler.\n"); + m_upscaler.reset(); + } + } else { + Utils::Log("Failed to initialize VideoUpscaler.\n"); + m_upscaler.reset(); + } +} + // Returns if the frame format has changed since the last call to this function bool VideoRenderer::hasFrameFormatChanged(const AVFrame* frame) { AVPixelFormat format = getFrameSwPixelFormat(frame); diff --git a/Streaming/VideoRenderer.h b/Streaming/VideoRenderer.h index 48176378..77b27d76 100644 --- a/Streaming/VideoRenderer.h +++ b/Streaming/VideoRenderer.h @@ -5,6 +5,7 @@ #include "State\MoonlightClient.h" #include "State\StreamConfiguration.h" #include +#include "VideoUpscaler.h" extern "C" { #include @@ -97,6 +98,13 @@ namespace moonlight_xbox_dx AVColorTransferCharacteristic m_LastColorTrc = AVCOL_TRC_UNSPECIFIED; AVColorSpace m_LastColorSpace = AVCOL_SPC_UNSPECIFIED; AVChromaLocation m_LastChromaLocation = AVCHROMA_LOC_UNSPECIFIED; + + std::unique_ptr m_upscaler; + Microsoft::WRL::ComPtr m_intermediateTex; + Microsoft::WRL::ComPtr m_intermediateRTV; + Microsoft::WRL::ComPtr m_intermediateSRV; + + void InitializeUpscaler(DXGI_FORMAT format, bool isHDR); }; } diff --git a/Streaming/VideoUpscaler.cpp b/Streaming/VideoUpscaler.cpp new file mode 100644 index 00000000..5c2d1784 --- /dev/null +++ b/Streaming/VideoUpscaler.cpp @@ -0,0 +1,229 @@ +#include "pch.h" +#include "VideoUpscaler.h" +#include "..\Common\DirectXHelper.h" +#include "Utils.hpp" +#include +#include + +#pragma comment(lib, "d3dcompiler") + +using namespace moonlight_xbox_dx; + +VideoUpscaler::VideoUpscaler(const std::shared_ptr& deviceResources) + : m_deviceResources(deviceResources), m_outWidth(0), m_outHeight(0) { +} + +VideoUpscaler::~VideoUpscaler() { + Cleanup(); +} + +bool VideoUpscaler::CreateConstantBuffer(const void* data, size_t size, ID3D11Buffer** buffer) { + D3D11_BUFFER_DESC desc = {}; + desc.Usage = D3D11_USAGE_IMMUTABLE; + desc.ByteWidth = static_cast((size + 15) & ~15); + desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + + D3D11_SUBRESOURCE_DATA initData = {}; + initData.pSysMem = data; + + HRESULT hr = m_deviceResources->GetD3DDevice()->CreateBuffer(&desc, &initData, buffer); + return SUCCEEDED(hr); +} + +bool VideoUpscaler::CreateCoefTexture(const void* data, int width, int height, int rowPitch, DXGI_FORMAT format, ID3D11Texture2D** tex, ID3D11ShaderResourceView** srv) { + D3D11_TEXTURE2D_DESC desc = {}; + desc.Width = width; + desc.Height = height; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = format; + desc.SampleDesc.Count = 1; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + + D3D11_SUBRESOURCE_DATA initData = {}; + initData.pSysMem = data; + initData.SysMemPitch = rowPitch; + + auto device = m_deviceResources->GetD3DDevice(); + if (FAILED(device->CreateTexture2D(&desc, &initData, tex))) return false; + if (FAILED(device->CreateShaderResourceView(*tex, nullptr, srv))) return false; + return true; +} + +// Initialize NIS components: Load shaders, setup constants and allocate output textures. +bool VideoUpscaler::Initialize(int inWidth, int inHeight, int outWidth, int outHeight, DXGI_FORMAT format, bool isHDR) { + Cleanup(); + + if (outWidth == 0 || outHeight == 0 || inWidth == 0 || inHeight == 0) { + return false; + } + + m_outWidth = outWidth; + m_outHeight = outHeight; + + auto device = m_deviceResources->GetD3DDevice(); + + // Check if Half-Precision (FP16) is supported + D3D11_FEATURE_DATA_SHADER_MIN_PRECISION_SUPPORT featureSupport = {}; + device->CheckFeatureSupport(D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT, &featureSupport, sizeof(featureSupport)); + bool supportsFP16 = (featureSupport.AllOtherShaderStagesMinPrecision & D3D11_SHADER_MIN_PRECISION_16_BIT) != 0; + + // Calculate optimal NIS parameters + NISGPUArchitecture gpuArch = supportsFP16 ? NISGPUArchitecture::NVIDIA_Generic_fp16 : NISGPUArchitecture::NVIDIA_Generic; + NISOptimizer opt(true, gpuArch); + + UINT blockWidth = opt.GetOptimalBlockWidth(); + UINT blockHeight = opt.GetOptimalBlockHeight(); + UINT threadGroupSize = opt.GetOptimalThreadGroupSize(); + + std::string sBlockWidth = std::to_string(blockWidth); + std::string sBlockHeight = std::to_string(blockHeight); + std::string sThreadGroupSize = std::to_string(threadGroupSize); + std::string sHDRMode = isHDR ? "2" : "0"; // 2 for PQ HDR + std::string sUseFP16 = supportsFP16 ? "1" : "0"; + + // 1. Compile NIS shader from HLSL source + try { + std::wstring fullShaderPath = Windows::ApplicationModel::Package::Current->InstalledLocation->Path->Data(); + fullShaderPath += L"\\third_party\\NVIDIAImageScaling\\NIS\\NIS_Main.hlsl"; + + D3D_SHADER_MACRO defines[] = { + { "NIS_SCALER", "1" }, + { "NIS_HDR_MODE", sHDRMode.c_str() }, + { "NIS_BLOCK_WIDTH", sBlockWidth.c_str() }, + { "NIS_BLOCK_HEIGHT", sBlockHeight.c_str() }, + { "NIS_THREAD_GROUP_SIZE", sThreadGroupSize.c_str() }, + { "NIS_USE_HALF_PRECISION", sUseFP16.c_str() }, + { nullptr, nullptr } + }; + + Microsoft::WRL::ComPtr shaderBlob; + Microsoft::WRL::ComPtr errorBlob; + + HRESULT hr = D3DCompileFromFile( + fullShaderPath.c_str(), + defines, + D3D_COMPILE_STANDARD_FILE_INCLUDE, + "main", + "cs_5_0", + D3DCOMPILE_OPTIMIZATION_LEVEL3, + 0, + &shaderBlob, + &errorBlob + ); + + if (FAILED(hr)) { + if (errorBlob) { + Utils::Logf("NIS Shader compilation failed: %s\n", (char*)errorBlob->GetBufferPointer()); + } else { + Utils::Logf("NIS Shader compilation failed with HRESULT 0x%X\n", hr); + } + return false; + } + + DX::ThrowIfFailed(device->CreateComputeShader(shaderBlob->GetBufferPointer(), shaderBlob->GetBufferSize(), nullptr, m_nisShader.GetAddressOf()), "Create NIS Compute Shader"); + } catch (Platform::Exception^ e) { + Utils::Logf("Failed to compile or create NIS shader. HRESULT: 0x%X\n", e->HResult); + return false; + } catch (...) { + Utils::Log("Failed to compile NIS shader with unknown exception\n"); + return false; + } + + // 2. Initialize NIS configuration constants + NISConfig config = {}; + float sharpness = 0.25f; + NISHDRMode hdrMode = isHDR ? NISHDRMode::PQ : NISHDRMode::None; + + NVScalerUpdateConfig(config, sharpness, 0, 0, inWidth, inHeight, inWidth, inHeight, 0, 0, outWidth, outHeight, outWidth, outHeight, hdrMode); + + if (!CreateConstantBuffer(&config, sizeof(config), m_nisCB.GetAddressOf())) return false; + + // 3. Create coefficient textures + const int rowPitch = supportsFP16 ? kFilterSize * sizeof(uint16_t) : kFilterSize * sizeof(float); + DXGI_FORMAT coefFormat = supportsFP16 ? DXGI_FORMAT_R16G16B16A16_FLOAT : DXGI_FORMAT_R32G32B32A32_FLOAT; + const void* scaleData = supportsFP16 ? (const void*)coef_scale_fp16 : (const void*)coef_scale; + const void* usmData = supportsFP16 ? (const void*)coef_usm_fp16 : (const void*)coef_usm; + + if (!CreateCoefTexture(scaleData, kFilterSize / 4, kPhaseCount, rowPitch, coefFormat, m_coefScaleTex.GetAddressOf(), m_coefScaleSRV.GetAddressOf())) return false; + if (!CreateCoefTexture(usmData, kFilterSize / 4, kPhaseCount, rowPitch, coefFormat, m_coefUsmTex.GetAddressOf(), m_coefUsmSRV.GetAddressOf())) return false; + + Utils::Logf("VideoUpscaler: Initialized NIS (%dx%d -> %dx%d, HDR: %d, FP16: %d, Block: %ux%u)\n", inWidth, inHeight, outWidth, outHeight, isHDR, supportsFP16, blockWidth, blockHeight); + + // 4. Create output texture (supporting UAV and SRV) + D3D11_TEXTURE2D_DESC texDesc = {}; + texDesc.Width = outWidth; + texDesc.Height = outHeight; + texDesc.MipLevels = 1; + texDesc.ArraySize = 1; + texDesc.Format = format; + texDesc.SampleDesc.Count = 1; + texDesc.Usage = D3D11_USAGE_DEFAULT; + texDesc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS; + + HRESULT hr = device->CreateTexture2D(&texDesc, nullptr, m_finalOutputTex.GetAddressOf()); + if (FAILED(hr)) return false; + device->CreateShaderResourceView(m_finalOutputTex.Get(), nullptr, m_finalOutputSRV.GetAddressOf()); + hr = device->CreateUnorderedAccessView(m_finalOutputTex.Get(), nullptr, m_finalOutputUAV.GetAddressOf()); + if (FAILED(hr)) { + Utils::Logf("Failed to create UAV for NIS final texture. HRESULT: 0x%X\n", hr); + return false; + } + + // 5. Create Sampler (Linear Clamp) + D3D11_SAMPLER_DESC sampDesc = {}; + sampDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; + sampDesc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; + sampDesc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; + sampDesc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; + device->CreateSamplerState(&sampDesc, m_sampler.GetAddressOf()); + + // 6. Calculate Dispatch arguments + m_dispatchX = static_cast(std::ceil(m_outWidth / float(blockWidth))); + m_dispatchY = static_cast(std::ceil(m_outHeight / float(blockHeight))); + + return true; +} + +// Dispatches the compute shader to apply NIS to the input frame. +ID3D11ShaderResourceView* VideoUpscaler::ProcessFrame(ID3D11ShaderResourceView* inputSRV) { + if (!m_nisShader || !inputSRV) return inputSRV; + + auto ctx = m_deviceResources->GetD3DDeviceContext(); + + ID3D11SamplerState* samplers[] = { m_sampler.Get() }; + ctx->CSSetSamplers(0, 1, samplers); + + // NIS Pass (Upscale + Sharpen) + ctx->CSSetShader(m_nisShader.Get(), nullptr, 0); + ctx->CSSetConstantBuffers(0, 1, m_nisCB.GetAddressOf()); + + ID3D11ShaderResourceView* srvs[] = { inputSRV, m_coefScaleSRV.Get(), m_coefUsmSRV.Get() }; + ctx->CSSetShaderResources(0, 3, srvs); + ctx->CSSetUnorderedAccessViews(0, 1, m_finalOutputUAV.GetAddressOf(), nullptr); + + ctx->Dispatch(m_dispatchX, m_dispatchY, 1); + + // Clean up CS state + ID3D11UnorderedAccessView* nullUAV[] = { nullptr }; + ctx->CSSetUnorderedAccessViews(0, 1, nullUAV, nullptr); + ID3D11ShaderResourceView* nullSRVs[] = { nullptr, nullptr, nullptr }; + ctx->CSSetShaderResources(0, 3, nullSRVs); + + return m_finalOutputSRV.Get(); +} + +// Release all associated resources to prevent leaks. +void VideoUpscaler::Cleanup() { + m_nisShader.Reset(); + m_nisCB.Reset(); + m_coefScaleTex.Reset(); + m_coefScaleSRV.Reset(); + m_coefUsmTex.Reset(); + m_coefUsmSRV.Reset(); + m_finalOutputTex.Reset(); + m_finalOutputSRV.Reset(); + m_finalOutputUAV.Reset(); + m_sampler.Reset(); +} diff --git a/Streaming/VideoUpscaler.h b/Streaming/VideoUpscaler.h new file mode 100644 index 00000000..5e7ad251 --- /dev/null +++ b/Streaming/VideoUpscaler.h @@ -0,0 +1,56 @@ +#pragma once + +#include "pch.h" +#include +#include +#include +#include "..\Common\DeviceResources.h" + +// Define NIS generic architecture mapping based on GPU +#include + +namespace moonlight_xbox_dx { + + class VideoUpscaler { + public: + VideoUpscaler(const std::shared_ptr& deviceResources); + ~VideoUpscaler(); + + // Initialize the shaders, buffers, and textures for a fixed input/output resolution + bool Initialize(int inWidth, int inHeight, int outWidth, int outHeight, DXGI_FORMAT format, bool isHDR); + + // Processes the input SRV through NIS scaling and sharpening pass + ID3D11ShaderResourceView* ProcessFrame(ID3D11ShaderResourceView* inputSRV); + + // Cleans up all D3D resources + void Cleanup(); + + private: + std::shared_ptr m_deviceResources; + + Microsoft::WRL::ComPtr m_nisShader; + + Microsoft::WRL::ComPtr m_nisCB; + + // NIS Coefficient textures + Microsoft::WRL::ComPtr m_coefScaleTex; + Microsoft::WRL::ComPtr m_coefScaleSRV; + Microsoft::WRL::ComPtr m_coefUsmTex; + Microsoft::WRL::ComPtr m_coefUsmSRV; + + Microsoft::WRL::ComPtr m_finalOutputTex; + Microsoft::WRL::ComPtr m_finalOutputSRV; + Microsoft::WRL::ComPtr m_finalOutputUAV; + + Microsoft::WRL::ComPtr m_sampler; + + int m_outWidth; + int m_outHeight; + uint32_t m_dispatchX; + uint32_t m_dispatchY; + + // Helper to initialize constant buffers + bool CreateConstantBuffer(const void* data, size_t size, ID3D11Buffer** buffer); + bool CreateCoefTexture(const void* data, int width, int height, int rowPitch, DXGI_FORMAT format, ID3D11Texture2D** tex, ID3D11ShaderResourceView** srv); + }; +} diff --git a/moonlight-xbox-dx.vcxproj b/moonlight-xbox-dx.vcxproj index 82c7f3d7..04427a4b 100644 --- a/moonlight-xbox-dx.vcxproj +++ b/moonlight-xbox-dx.vcxproj @@ -146,7 +146,7 @@ pch.h $(IntDir)pch.pch - $(ProjectDir);$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)third_party\NVIDIAImageScaling\NIS;$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 _DEBUG;%(PreprocessorDefinitions);_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING @@ -162,7 +162,7 @@ pch.h $(IntDir)pch.pch - $(ProjectDir);$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)third_party\NVIDIAImageScaling\NIS;$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 NDEBUG;%(PreprocessorDefinitions);_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING @@ -178,7 +178,7 @@ pch.h $(IntDir)pch.pch - $(ProjectDir);$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)third_party\NVIDIAImageScaling\NIS;$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 _DEBUG;%(PreprocessorDefinitions);_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING @@ -194,7 +194,7 @@ pch.h $(IntDir)pch.pch - $(ProjectDir);$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)third_party\NVIDIAImageScaling\NIS;$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 NDEBUG;%(PreprocessorDefinitions);_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING @@ -210,7 +210,7 @@ pch.h $(IntDir)pch.pch - $(ProjectDir);$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)third_party\NVIDIAImageScaling\NIS;$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 _DEBUG;%(PreprocessorDefinitions);_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING @@ -226,7 +226,7 @@ pch.h $(IntDir)pch.pch - $(ProjectDir);$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)third_party\NVIDIAImageScaling\NIS;$(SolutionDir)\third_party\DirectXTK\inc;$(IntermediateOutputPath);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 NDEBUG;%(PreprocessorDefinitions);_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING @@ -242,7 +242,7 @@ pch.h $(IntDir)pch.pch - $(ProjectDir);$(SolutionDir)\third_party\DirectXTK\inc;$(ProjectDir)vcpkg_installed\x64-uwp\include;$(IntermediateOutputPath);third_party\moonlight-common-c\src;third_party\imgui;third_party\imgui\backends;third_party\imgui-uwp\backends;third_party\implot;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)third_party\NVIDIAImageScaling\NIS;$(SolutionDir)\third_party\DirectXTK\inc;$(ProjectDir)vcpkg_installed\x64-uwp\include;$(IntermediateOutputPath);third_party\moonlight-common-c\src;third_party\imgui;third_party\imgui\backends;third_party\imgui-uwp\backends;third_party\implot;%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions);_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING @@ -262,7 +262,7 @@ pch.h $(IntDir)pch.pch - $(ProjectDir);$(SolutionDir)\third_party\DirectXTK\inc;$(ProjectDir)vcpkg_installed\x64-uwp\include;$(IntermediateOutputPath);third_party\moonlight-common-c\src;third_party\imgui;third_party\imgui\backends;third_party\imgui-uwp\backends;third_party\implot;%(AdditionalIncludeDirectories) + $(ProjectDir);$(ProjectDir)third_party\NVIDIAImageScaling\NIS;$(SolutionDir)\third_party\DirectXTK\inc;$(ProjectDir)vcpkg_installed\x64-uwp\include;$(IntermediateOutputPath);third_party\moonlight-common-c\src;third_party\imgui;third_party\imgui\backends;third_party\imgui-uwp\backends;third_party\implot;%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions);_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING @@ -354,6 +354,7 @@ + @@ -491,6 +492,7 @@ + @@ -616,6 +618,18 @@ true + + true + Document + + + true + Document + + + true + Document + true Document diff --git a/moonlight-xbox-dx.vcxproj.filters b/moonlight-xbox-dx.vcxproj.filters index 6e8d645d..15dc3741 100644 --- a/moonlight-xbox-dx.vcxproj.filters +++ b/moonlight-xbox-dx.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -45,6 +45,9 @@ Source Files + + Source Files + Source Files @@ -381,6 +384,9 @@ Source Files + + Source Files + @@ -401,6 +407,9 @@ Header Files + + Header Files + Header Files @@ -476,6 +485,9 @@ Header Files + + Header Files + @@ -672,8 +684,17 @@ Assets + + Shaders + + + Header Files + + + Header Files + diff --git a/third_party/NVIDIAImageScaling b/third_party/NVIDIAImageScaling new file mode 160000 index 00000000..35e13ba3 --- /dev/null +++ b/third_party/NVIDIAImageScaling @@ -0,0 +1 @@ +Subproject commit 35e13ba316c98eeecf16f37eae70ce88019911f6 From bb1a21e95072a66ebefa91a714102a470abb5cee Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 23 Apr 2026 03:10:33 +0200 Subject: [PATCH 2/9] Guard GetStreamConfig() before dereferencing it. --- State/Stats.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/State/Stats.cpp b/State/Stats.cpp index 31a37096..46671c1d 100644 --- a/State/Stats.cpp +++ b/State/Stats.cpp @@ -311,7 +311,9 @@ void Stats::formatVideoStats(DX::StepTimer const& timer, VIDEO_STATS& stats, cha double avgVideoMbps = m_bwTracker.GetAverageMbps(); double peakVideoMbps = m_bwTracker.GetPeakMbps(); - if (GetStreamConfig()->videoSuperResolution) { + bool isVSREnabled = GetStreamConfig() != nullptr && GetStreamConfig()->videoSuperResolution; + + if (isVSREnabled) { ret = snprintf(&output[offset], length - offset, "Bitrate: %.1f Mbps, Peak (%us): %.1f\n" From 051fea6eb9e0a4f51e73670040440af6de8dd762 Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 23 Apr 2026 07:50:26 +0200 Subject: [PATCH 3/9] Remove unused InitializeUpscaler method --- Streaming/VideoRenderer.cpp | 51 +------------------------------------ 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/Streaming/VideoRenderer.cpp b/Streaming/VideoRenderer.cpp index dbbc6012..bd77de65 100644 --- a/Streaming/VideoRenderer.cpp +++ b/Streaming/VideoRenderer.cpp @@ -1,4 +1,4 @@ -#include "pch.h" +#include "pch.h" #include "VideoRenderer.h" #include #include "..\Common\DirectXHelper.h" @@ -723,55 +723,6 @@ void VideoRenderer::getFrameChromaCositingOffsets(const AVFrame* frame, std::arr } } -void VideoRenderer::InitializeUpscaler(DXGI_FORMAT format, bool isHDR) { - if (!configuration->videoSuperResolution) return; - - if (!m_upscaler) { - m_upscaler = std::make_unique(m_deviceResources); - } - - // First, calculate the true destination size and offsets (to preserve aspect ratio and add black bars) - IRECT src, fsrDst; - src.x = src.y = 0; - src.w = configuration->width; - src.h = configuration->height; - - // FSR true pixel-based destination rect - fsrDst.x = fsrDst.y = 0; - fsrDst.w = m_deviceResources->GetPixelWidth(); - fsrDst.h = m_deviceResources->GetPixelHeight(); - scaleSourceToDestinationSurface(&src, &fsrDst); - - // Initialize the Upscaler to upscale exactly to the aspect-ratio-preserved dimensions in raw pixels - if (m_upscaler->Initialize(src.w, src.h, fsrDst.w, fsrDst.h, format, isHDR)) { - - // Create the intermediate texture that the pixel shader will render into (instead of the backbuffer) - D3D11_TEXTURE2D_DESC texDesc = {}; - texDesc.Width = configuration->width; - texDesc.Height = configuration->height; - texDesc.MipLevels = 1; - texDesc.ArraySize = 1; - texDesc.Format = format; // Match backbuffer format or HDR format - texDesc.SampleDesc.Count = 1; - texDesc.Usage = D3D11_USAGE_DEFAULT; - texDesc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE; - - auto device = m_deviceResources->GetD3DDevice(); - HRESULT hr = device->CreateTexture2D(&texDesc, nullptr, m_intermediateTex.GetAddressOf()); - if (SUCCEEDED(hr)) { - device->CreateRenderTargetView(m_intermediateTex.Get(), nullptr, m_intermediateRTV.GetAddressOf()); - device->CreateShaderResourceView(m_intermediateTex.Get(), nullptr, m_intermediateSRV.GetAddressOf()); - Utils::Log("VideoUpscaler initialized successfully.\n"); - } else { - Utils::Log("Failed to create intermediate texture for VideoUpscaler.\n"); - m_upscaler.reset(); - } - } else { - Utils::Log("Failed to initialize VideoUpscaler.\n"); - m_upscaler.reset(); - } -} - // Returns if the frame format has changed since the last call to this function bool VideoRenderer::hasFrameFormatChanged(const AVFrame* frame) { AVPixelFormat format = getFrameSwPixelFormat(frame); From 7586d343d3c317c2d6ea603db9052a556688dd56 Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 23 Apr 2026 07:50:57 +0200 Subject: [PATCH 4/9] Check all dependent D3D resource creation calls --- Streaming/VideoRenderer.cpp | 28 ++++++++++++++++------------ Streaming/VideoRenderer.h | 2 -- Streaming/VideoUpscaler.cpp | 20 ++++++++++++-------- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/Streaming/VideoRenderer.cpp b/Streaming/VideoRenderer.cpp index bd77de65..ebfc666c 100644 --- a/Streaming/VideoRenderer.cpp +++ b/Streaming/VideoRenderer.cpp @@ -1,4 +1,4 @@ -#include "pch.h" +#include "pch.h" #include "VideoRenderer.h" #include #include "..\Common\DirectXHelper.h" @@ -155,11 +155,15 @@ bool VideoRenderer::Render(AVFrame *frame) { texDesc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE; auto device = m_deviceResources->GetD3DDevice(); - HRESULT hr = device->CreateTexture2D(&texDesc, nullptr, m_intermediateTex.GetAddressOf()); + HRESULT hr = device->CreateTexture2D(&texDesc, nullptr, m_intermediateTex.ReleaseAndGetAddressOf()); if (SUCCEEDED(hr)) { - device->CreateRenderTargetView(m_intermediateTex.Get(), nullptr, m_intermediateRTV.GetAddressOf()); - device->CreateShaderResourceView(m_intermediateTex.Get(), nullptr, m_intermediateSRV.GetAddressOf()); - } else { + hr = device->CreateRenderTargetView(m_intermediateTex.Get(), nullptr, m_intermediateRTV.ReleaseAndGetAddressOf()); + if (SUCCEEDED(hr)) { + hr = device->CreateShaderResourceView(m_intermediateTex.Get(), nullptr, m_intermediateSRV.ReleaseAndGetAddressOf()); + } + } + + if (FAILED(hr)) { m_upscaler.reset(); } } else { @@ -250,14 +254,14 @@ bool VideoRenderer::Render(AVFrame *frame) { // For simplicity and to ensure it displays, if m_upscaler gives us an SRV, we can retrieve its texture // and copy it to the backbuffer if dimensions match. Microsoft::WRL::ComPtr upscaledRes; - finalSRV->GetResource(upscaledRes.GetAddressOf()); + finalSRV->GetResource(upscaledRes.ReleaseAndGetAddressOf()); Microsoft::WRL::ComPtr upscaledTex; upscaledRes.As(&upscaledTex); if (upscaledTex) { Microsoft::WRL::ComPtr backBufferRes; - backBufferRTV[0]->GetResource(backBufferRes.GetAddressOf()); + backBufferRTV[0]->GetResource(backBufferRes.ReleaseAndGetAddressOf()); Microsoft::WRL::ComPtr backBufferTex; backBufferRes.As(&backBufferTex); @@ -320,7 +324,7 @@ void VideoRenderer::CreateDeviceDependentResources() vertexShaderBytecode.data(), vertexShaderBytecode.size(), nullptr, - &m_vertexShader + m_vertexShader.ReleaseAndGetAddressOf() ) , "Vertex Shader Creation"); @@ -336,7 +340,7 @@ void VideoRenderer::CreateDeviceDependentResources() ARRAYSIZE(vertexDesc), vertexShaderBytecode.data(), vertexShaderBytecode.size(), - &m_inputLayout + m_inputLayout.ReleaseAndGetAddressOf() ) , "Input Layout Creation"); } @@ -349,7 +353,7 @@ void VideoRenderer::CreateDeviceDependentResources() pixelShaderBytecode.data(), pixelShaderBytecode.size(), nullptr, - &m_pixelShaderYUV420 + m_pixelShaderYUV420.ReleaseAndGetAddressOf() ) , "Pixel Shader Creation"); } @@ -380,7 +384,7 @@ void VideoRenderer::CreateDeviceDependentResources() samplerDesc.MinLOD = 0.0f; samplerDesc.MaxLOD = D3D11_FLOAT32_MAX; - DX::ThrowIfFailed(m_deviceResources->GetD3DDevice()->CreateSamplerState(&samplerDesc, &m_samplerState)); + DX::ThrowIfFailed(m_deviceResources->GetD3DDevice()->CreateSamplerState(&samplerDesc, m_samplerState.ReleaseAndGetAddressOf())); } // We use a common index buffer for all geometry @@ -398,7 +402,7 @@ void VideoRenderer::CreateDeviceDependentResources() indexBufferData.pSysMem = indexes; indexBufferData.SysMemPitch = sizeof(int); - DX::ThrowIfFailed(m_deviceResources->GetD3DDevice()->CreateBuffer(&indexBufferDesc, &indexBufferData, &m_indexBuffer), "Index Buffer creation"); + DX::ThrowIfFailed(m_deviceResources->GetD3DDevice()->CreateBuffer(&indexBufferDesc, &indexBufferData, m_indexBuffer.ReleaseAndGetAddressOf()), "Index Buffer creation"); } DISPATCH_THREADPOOL(([this, devRes = m_deviceResources, cfg = configuration] { diff --git a/Streaming/VideoRenderer.h b/Streaming/VideoRenderer.h index 77b27d76..1a7c20c5 100644 --- a/Streaming/VideoRenderer.h +++ b/Streaming/VideoRenderer.h @@ -103,8 +103,6 @@ namespace moonlight_xbox_dx Microsoft::WRL::ComPtr m_intermediateTex; Microsoft::WRL::ComPtr m_intermediateRTV; Microsoft::WRL::ComPtr m_intermediateSRV; - - void InitializeUpscaler(DXGI_FORMAT format, bool isHDR); }; } diff --git a/Streaming/VideoUpscaler.cpp b/Streaming/VideoUpscaler.cpp index 5c2d1784..0d1c20e8 100644 --- a/Streaming/VideoUpscaler.cpp +++ b/Streaming/VideoUpscaler.cpp @@ -122,7 +122,7 @@ bool VideoUpscaler::Initialize(int inWidth, int inHeight, int outWidth, int outH return false; } - DX::ThrowIfFailed(device->CreateComputeShader(shaderBlob->GetBufferPointer(), shaderBlob->GetBufferSize(), nullptr, m_nisShader.GetAddressOf()), "Create NIS Compute Shader"); + DX::ThrowIfFailed(device->CreateComputeShader(shaderBlob->GetBufferPointer(), shaderBlob->GetBufferSize(), nullptr, m_nisShader.ReleaseAndGetAddressOf()), "Create NIS Compute Shader"); } catch (Platform::Exception^ e) { Utils::Logf("Failed to compile or create NIS shader. HRESULT: 0x%X\n", e->HResult); return false; @@ -138,7 +138,7 @@ bool VideoUpscaler::Initialize(int inWidth, int inHeight, int outWidth, int outH NVScalerUpdateConfig(config, sharpness, 0, 0, inWidth, inHeight, inWidth, inHeight, 0, 0, outWidth, outHeight, outWidth, outHeight, hdrMode); - if (!CreateConstantBuffer(&config, sizeof(config), m_nisCB.GetAddressOf())) return false; + if (!CreateConstantBuffer(&config, sizeof(config), m_nisCB.ReleaseAndGetAddressOf())) return false; // 3. Create coefficient textures const int rowPitch = supportsFP16 ? kFilterSize * sizeof(uint16_t) : kFilterSize * sizeof(float); @@ -146,8 +146,8 @@ bool VideoUpscaler::Initialize(int inWidth, int inHeight, int outWidth, int outH const void* scaleData = supportsFP16 ? (const void*)coef_scale_fp16 : (const void*)coef_scale; const void* usmData = supportsFP16 ? (const void*)coef_usm_fp16 : (const void*)coef_usm; - if (!CreateCoefTexture(scaleData, kFilterSize / 4, kPhaseCount, rowPitch, coefFormat, m_coefScaleTex.GetAddressOf(), m_coefScaleSRV.GetAddressOf())) return false; - if (!CreateCoefTexture(usmData, kFilterSize / 4, kPhaseCount, rowPitch, coefFormat, m_coefUsmTex.GetAddressOf(), m_coefUsmSRV.GetAddressOf())) return false; + if (!CreateCoefTexture(scaleData, kFilterSize / 4, kPhaseCount, rowPitch, coefFormat, m_coefScaleTex.ReleaseAndGetAddressOf(), m_coefScaleSRV.ReleaseAndGetAddressOf())) return false; + if (!CreateCoefTexture(usmData, kFilterSize / 4, kPhaseCount, rowPitch, coefFormat, m_coefUsmTex.ReleaseAndGetAddressOf(), m_coefUsmSRV.ReleaseAndGetAddressOf())) return false; Utils::Logf("VideoUpscaler: Initialized NIS (%dx%d -> %dx%d, HDR: %d, FP16: %d, Block: %ux%u)\n", inWidth, inHeight, outWidth, outHeight, isHDR, supportsFP16, blockWidth, blockHeight); @@ -162,10 +162,13 @@ bool VideoUpscaler::Initialize(int inWidth, int inHeight, int outWidth, int outH texDesc.Usage = D3D11_USAGE_DEFAULT; texDesc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS; - HRESULT hr = device->CreateTexture2D(&texDesc, nullptr, m_finalOutputTex.GetAddressOf()); + HRESULT hr = device->CreateTexture2D(&texDesc, nullptr, m_finalOutputTex.ReleaseAndGetAddressOf()); if (FAILED(hr)) return false; - device->CreateShaderResourceView(m_finalOutputTex.Get(), nullptr, m_finalOutputSRV.GetAddressOf()); - hr = device->CreateUnorderedAccessView(m_finalOutputTex.Get(), nullptr, m_finalOutputUAV.GetAddressOf()); + + hr = device->CreateShaderResourceView(m_finalOutputTex.Get(), nullptr, m_finalOutputSRV.ReleaseAndGetAddressOf()); + if (FAILED(hr)) return false; + + hr = device->CreateUnorderedAccessView(m_finalOutputTex.Get(), nullptr, m_finalOutputUAV.ReleaseAndGetAddressOf()); if (FAILED(hr)) { Utils::Logf("Failed to create UAV for NIS final texture. HRESULT: 0x%X\n", hr); return false; @@ -177,7 +180,8 @@ bool VideoUpscaler::Initialize(int inWidth, int inHeight, int outWidth, int outH sampDesc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; sampDesc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; sampDesc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; - device->CreateSamplerState(&sampDesc, m_sampler.GetAddressOf()); + hr = device->CreateSamplerState(&sampDesc, m_sampler.ReleaseAndGetAddressOf()); + if (FAILED(hr)) return false; // 6. Calculate Dispatch arguments m_dispatchX = static_cast(std::ceil(m_outWidth / float(blockWidth))); From 7987cb5c81cc3b1b715604dd3eb7e9daccd6a328 Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 23 Apr 2026 08:43:26 +0200 Subject: [PATCH 5/9] Precompile the NIS shader to .cso files --- Assets/Shader/build_nis.bat | 6 +++ Assets/Shader/nis_hdr_fp16.cso | Bin 0 -> 26904 bytes Assets/Shader/nis_hdr_fp32.cso | Bin 0 -> 26648 bytes Assets/Shader/nis_sdr_fp16.cso | Bin 0 -> 26904 bytes Assets/Shader/nis_sdr_fp32.cso | Bin 0 -> 26648 bytes Streaming/VideoUpscaler.cpp | 67 +++++------------------------- moonlight-xbox-dx.vcxproj | 15 +++++-- moonlight-xbox-dx.vcxproj.filters | 12 ++++++ 8 files changed, 40 insertions(+), 60 deletions(-) create mode 100644 Assets/Shader/build_nis.bat create mode 100644 Assets/Shader/nis_hdr_fp16.cso create mode 100644 Assets/Shader/nis_hdr_fp32.cso create mode 100644 Assets/Shader/nis_sdr_fp16.cso create mode 100644 Assets/Shader/nis_sdr_fp32.cso diff --git a/Assets/Shader/build_nis.bat b/Assets/Shader/build_nis.bat new file mode 100644 index 00000000..42f75ac2 --- /dev/null +++ b/Assets/Shader/build_nis.bat @@ -0,0 +1,6 @@ +@echo off +set HLSL=..\..\third_party\NVIDIAImageScaling\NIS\NIS_Main.hlsl +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=0 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=32 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=1 /Fo nis_sdr_fp16.cso %HLSL% +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=2 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=32 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=1 /Fo nis_hdr_fp16.cso %HLSL% +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=0 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=24 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=0 /Fo nis_sdr_fp32.cso %HLSL% +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=2 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=24 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=0 /Fo nis_hdr_fp32.cso %HLSL% diff --git a/Assets/Shader/nis_hdr_fp16.cso b/Assets/Shader/nis_hdr_fp16.cso new file mode 100644 index 0000000000000000000000000000000000000000..d2c8d84c927c7ca8ac244c116b7bf7c787097f21 GIT binary patch literal 26904 zcmeI5U5s7VRmabald*mKk=FfCG%fATq)Lh{v#IDZlbN2eLwf<}Eb@twO<~qIi-0G=+-u?aCKK<;UegE&j`N3y@?%%$7 zbfIaQTQ{0!N&Sa(z5P(ryjRypbUl5sX?|JPBlq67_Pv8m19qezU_YX(x%teg=33MI zg=CN1d+Zovx9S?|x>MJ?biGy=?LTxKh`aG0*yOrJKNi*Btm`IS|E;DjWUo`d+#|Ox z@;iFu*aL(7$903;jsm!DqWdT`^?`uVL>PwT1Kxb&Ir^Xm1j&8ypcfD6rwFXH3vvUN`V<>c!xA*BXCIR9OFb`ISCNaJ8; z;r>%NP2Wu1Et*K?XO_KX;odL@?k?fpJO}Rm!cix){C-$C@-+*0TDajHxK9c9t~qd* zgrk0E`TZ5)-a7~G%fcO<1NWS8KQRaHPlV%Lg&%EFy}TeC@8m4pp9?oCxM}tGP2ujH z1NR-_PA9)V&@;_-?Ea9}jR!Suev@$T5bohQaL0vvbPnA8!kwD~_w&MidJf!G;U1d< z_glg}F$eBz!d*Wp*50?2Zo>!vF2kNk8f>W*?e+) zc;_Q`4NpIK=E0%n<%#vJ;i=7ME^lbV8Xi0P{$tGpXYN17o987908_!$sbQMfR4j;p#^%j&uUvv{q7j&5SV>I2L4Df z?C2g{uDhD%@bQo~&6@l#j@sDdrndKJ=z75{-PFb?;lN|hzrGz?990!=?%_JF<46~` z^o1evI3F#JxU20Y-Mw@&`Lpe}X$+ol{^6kY_YQHW+zY?OQPT{C;c|n27bjV-uEvA6 zb>ZLDUE3Lkn7l5I^h2D>6%VUD{>&f1THz}Ghm!4`laeir%X>L8H+g=f6LW#C=Vx)G zhte45lD~t=Ur5O%vO9PU{-J4BOOBTd$H5-g;6idJ+hCh#*gTp z`J(4NG9F$u@e2Ro83Swoi`KP;eb2M&GGnO6jNzG>GKLz=7@omU*W{PELytau zsleZ=+i%_4Ebxx={?WkD!0-WQ-k^=;5NnvvtS|jdz@TWPZoF#|NA;9zM70 z#XX_c=CIvF0C1wlcxEG=8XAA4j+6I7j3D`C77I_ zNf_+F)p_l+vs*Casn5T(UZ zPQWjW^g}K4CN^a7o`hK`GI&qI5F0Xh_hBT8eF_Pi;)bnCi08;nQO4)3( zc7Lkm2^smJ_xttw9zA2^x7zertGB~vfvDwTGxEDSdX^>9cHIOB7$NIme2e{C4Z4Ya4m?OD=zMytcyzeDnN*>BfZbjPX1% zhODfMF<+J)F0x#&A1%5C;pHT1A539vtH(apNyAY z&6)A`lWo}_vKz8N9<-K3zoyS6U|&!kZ|E%Kbq(8oH^HF8KKhS^Lq4B@rLE|?J?_S9 ziS=$-dh}|w&fx5|u-K?;wD5I*Fn{S*xyGi-WxG!v^OO0&i_?6b4t*HxfGIIlU3`Mi`(yUS zea7f9>J~d1ul2z*``YfFkMOlHl0c1pZMDd(M~vvPuUY1?RkN#W74oPC10 zSa+7y!?(LnWH~tdXP>}t=a%Ek3*$2J%3GR`VJVifE&-+@*aWCHs#opPa z)-GptVxGj8xFaVekJ+|)n-enU$-LQ{$b&FZ!`IYv?>tyuVyyL&{q7ddwoOlNymxu; zFtb9=m**9?){fNsx=@molA-b(H#>^RvTEtxRDlhZT^2~dh-1{9i zC+#cPx+Xc?{W*twkE82*#{GGz%vb1|bGE}fmB;hF^Taz0#}n!q8>q*wKQDRTrC%87 zhZ_4zpB@ZciJVIo`OR|HX>_SS#oO}P8S1HRtpAo{8=QHwP7^O<-Oo$J zrP!-3^99Z}uv>K{BTu$FO%J{)$D!A^4`L6W^!OydllWSW->z-*hVQEE5ZB$MpQdMw z_Y`<&tk#WVMUGGG%2%z)Y}K>p4z(*AX_+1MgVykvU{MeliE!#LsTWR+il;GCnVn zNAD*uq|Zxmh}?_>P%}oiwSK^mPi)hxRoRIogQHrl=|Oo%XRVPP`B={JCp&Rg!uAE- zoswg*rEsD9m}?mWn1=__3lnK$tAMYqKC|R#&70ey==?&>1}Iwf-Use zGsq2l20i-$eDj_`9=dx5SpAMIV%Kfd0sX>=AMM|1_4mvr=O%wYL*ga!uYT-%8~VHL zq3dOQ5j&mszNY!j>rML|1b7qQnm%7)XYE(p{!226Z5mvV(Z~BXY`-I-p@{Feeus$M zIb+^vYsL0E^=Dzmz>tqF9=q)8KUD7E@)o)3<*1yRBRJdQ{?+)-_&(p|@8XeLnXb8I zK9!gF-4f&IzOD4g2KufR^TT(WJTLGnE#4LQI~VAy#osIH{FXdE!tIK`lQvBn01|FkVi_Zi2vrhJ{^)lY8Jl1m9S+%{Q8$NC? z_AtDx9DyC`o;=XLpj+on%M!-*0$%4I``b=??IT;QB6O7Ja5J#r(ef5hpq==e8!XmvOJrGjlf!_gdk|YadRc!^DkG@!L5$ zQsT-zz8Pm8!7%Q>$q{&*j_@6MlXfjJ@!Ho9|{F)Ibr zowtmEH+J-XjLoevlX%}Dopq{Elrzpd-9beZ=N-Ou6; zW)^QSvv`A<#{0P5**6K3-^=TI{%c)s@a7$7O@%l3zV(Fl8yUR&FcQVt1)1!`ndD%# z)&4$%HL2LBa@))LihHVDG4GQrj(WajEg}~7B*)_OtAJTiMsD z9J}adocMYjtvKsu9J=M*-iOQlISXX|_%r`(55MKT414HJ@_R(G6D7`!%lSYTU+ODA z{H)@vIP7)f?89NN8>ex^X@0_mKh83i!)wyKXI!>} z?zDWtyPL1<&wK{Lm3?t)9?*m+EZhkKm{qFi9 z)6LSq?9Z?BYCPw>oDcZt{DSMt8)Ng-FF7k`gsJm@y?OHnKj)*H-)`RIzvh?Nn1@_% z@*8rmkKKI0Yo2_FPvpbArqw0+Ft15C?9G!8*@^wterM%lxhEgTMCXR=kb}jMesmh2 zfe&izo#o%4fK#h$E51)^fZW1|e5s}muj<}o{2qW@@=R>>YH@x5FIm{&-A7K34dxR$ zcCjJ;@r*4nYQdvm!UlB-j@~@74RrksMlHUR$e4MQH8<7dWa&(=Kf)9*qn;OG69M#u%Pc~w2&o!9W zM#ZoHg|CX!Sk*`FxVt#@ix#-J><+4%j!N;{)=5Jt}WMepN5^oo0{^S>V#?7<0z@Pc*`ptQp<~QffIGKz( zq@IY8IlOyk7`3L`sHqPP+gb*roV5GY&Jc0P)kUord9Bkn_dEPM=+_)Cdi?GS+;@L% zsGsfcp}$ycmHCO^DU&;Mv`@`l{B9F{b6qa>^f%r*uSu_R`G9ntw=6 zT`73tMQ@;;_Nj1Uu|)@W}OcKx6pFCp}oT zx<89+wSf=YaLu8E4P>q*+qhoF^zZe<27B)FI#bvNJkYTXde@5g@ZAnZd;)_%@8RU6 z>?PIDKx1W}s{60~AoJd18^i-|*{?S6VH=j)2C{+=9^HKj9P{pZ@@IPLgt)Pb4dPW_ z_Z7`g-G9Zij$_YrR5(?fWMeqzw2M2DaJsL#2iM(~GJoXV&peFTZ{C;Co8&j|OUBKU zxBpA~d0*cCe?K4JH>nS5Uuzos!T)+c&wDoY%=`hBD)9&E#jwSxQ1$$nWg@XH!t4E;dQ-m@*UP5a01?gYKOuUZfP*jAglXPdKp z#rkKy^p2N%xa4>pOJ6Rs->O&kROU)+@7UQV+n0E3p9=dudp5bszPo#Nl1E%%+cmlU zUR{!ho$j7(Ik{xdb{zC&ovUXH%gBG;yS+yv@9xn9jg`6$e(a^316DMi^HKH@&e)Nc zKAABxkw4c)U5S6#r~a_9o9tuDwL%X@EzUF4B=N9MihtPf{+;&S;7TmsSHY;&&$Y

W~b=X-*NaokZzqn>^LsVvmMLn$)Q@U>w(5f-8a;{=ecl+ zytMTke@_ZM?;FHgWG^u<)G|EqW8OKh#xQ0Kxg=N0OZWogoEihilH=&XT8oO2HHIzc>OOJ3r8W5i>>^xd=8xX#|+oqR?`$N3R<2iyL; z8T^qe?m7-O$3UGLr#LGPzvR_<$vD}lIN2V1S8y_`32^W@EERP(prZr&#O z?dA=fTD()t4LObZNP9T%KcBl-By(NUdk;shmgTYbfGKqzzjL}!^!Z*Jva`QF)X(;J zPD{Ic_q;DDzL+O+ijLnU?km?K)A=XPPsD_bUV4>_&p;h{*u5>Sd2k-Kx{(Xs@m-;q zdw7r^&0{8ZRfQKeD+7|=$I2S^8`!$S!TTL z*l(X6GUf*R)-xv!?b}z05jl9ZdcKvfm=}E54z|f*9<#3JuIsmJ*S5O9b24Z79kVa@ zV{3faPqhzeYTx>{@7hPMmgNx_c3k^jr!)6S=U42zK8+_IT5I;5U%?)fY@i;j&#&aH zoL}o)f#E$x=YV?Nqurv%*dE^|{yQ_C2hS7dFKqZcXu0Rdd8PN6lAM(qikxsZ0*{<{ zEVm7K6ns4w?UpfN!iLvXY+(aA+--v%8}wl9$GOaLw)4}x#F@r^I=P7b-De5g26IHV z$%oISE5)BN%X%hPJTsquU*Tj7`d-Hv2ZJy3cklBp&uaBEgX~03uz{@-Z=7Ahif5b^ zogdo+uU0=dfIF!HVu82qIPPr6el%9+*|AHv&NFh`u{_(cA9~_b3qEj^kFZ1DbRYT9 zJjNNN%wvtqa(eJ;@h(#1jFp-XdyJ{Y@1IM4;$3L#VCNp6ZQ*UZmU$1b9vHYgr}SWm zHDj=ov7Teb?k+NVbc_YF+Ogw&8EaqJ&I##|A7gE&UXg1^Q-0JQpbrCUi8F3Z5StC6$gLf>BDKP z;^3Fg$+J=<{hU_nM;qk7ICnoMlcp3kU`m)?4o8Sfs9T6~5ndbI}38M$*TUm?%_Z99)y z*Rj|iy=5J{F=u_}SLq60 zPv0nZ`8QYS@^3$*J=XRMqxMlx1N^W)tm(f&375su{{NP;hJz0{agF?O?;Pm%;8yWz zKDMX-kCmI@L(TC$E;xT(_#5AEe-p=;W%$>>?TGhHw~-fm_~P%a>OQLL%-RD-c}GfA y&6!6}KKgrlenpG#o7K};hyPYe%2jiJd1lX@)R?E-;Btp9+sm?9_xPs4`F{Yb;ZHmO literal 0 HcmV?d00001 diff --git a/Assets/Shader/nis_hdr_fp32.cso b/Assets/Shader/nis_hdr_fp32.cso new file mode 100644 index 0000000000000000000000000000000000000000..fcc664dd37f3db73d5d455f8453656ec96ce688f GIT binary patch literal 26648 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 literal 0 HcmV?d00001 diff --git a/Assets/Shader/nis_sdr_fp32.cso b/Assets/Shader/nis_sdr_fp32.cso new file mode 100644 index 0000000000000000000000000000000000000000..1980e040b31ba2bdabff91dc6d8a3bea333d0395 GIT binary patch literal 26648 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 #include -#pragma comment(lib, "d3dcompiler") - using namespace moonlight_xbox_dx; VideoUpscaler::VideoUpscaler(const std::shared_ptr& deviceResources) @@ -69,65 +66,23 @@ bool VideoUpscaler::Initialize(int inWidth, int inHeight, int outWidth, int outH device->CheckFeatureSupport(D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT, &featureSupport, sizeof(featureSupport)); bool supportsFP16 = (featureSupport.AllOtherShaderStagesMinPrecision & D3D11_SHADER_MIN_PRECISION_16_BIT) != 0; - // Calculate optimal NIS parameters - NISGPUArchitecture gpuArch = supportsFP16 ? NISGPUArchitecture::NVIDIA_Generic_fp16 : NISGPUArchitecture::NVIDIA_Generic; - NISOptimizer opt(true, gpuArch); - - UINT blockWidth = opt.GetOptimalBlockWidth(); - UINT blockHeight = opt.GetOptimalBlockHeight(); - UINT threadGroupSize = opt.GetOptimalThreadGroupSize(); + // Based on NIS static compilation parameters + UINT blockWidth = 32; + UINT blockHeight = supportsFP16 ? 32 : 24; - std::string sBlockWidth = std::to_string(blockWidth); - std::string sBlockHeight = std::to_string(blockHeight); - std::string sThreadGroupSize = std::to_string(threadGroupSize); - std::string sHDRMode = isHDR ? "2" : "0"; // 2 for PQ HDR - std::string sUseFP16 = supportsFP16 ? "1" : "0"; + std::wstring shaderPath = L"Assets\\Shader\\nis_"; + shaderPath += isHDR ? L"hdr_" : L"sdr_"; + shaderPath += supportsFP16 ? L"fp16.cso" : L"fp32.cso"; - // 1. Compile NIS shader from HLSL source + // 1. Load precompiled NIS shader try { - std::wstring fullShaderPath = Windows::ApplicationModel::Package::Current->InstalledLocation->Path->Data(); - fullShaderPath += L"\\third_party\\NVIDIAImageScaling\\NIS\\NIS_Main.hlsl"; - - D3D_SHADER_MACRO defines[] = { - { "NIS_SCALER", "1" }, - { "NIS_HDR_MODE", sHDRMode.c_str() }, - { "NIS_BLOCK_WIDTH", sBlockWidth.c_str() }, - { "NIS_BLOCK_HEIGHT", sBlockHeight.c_str() }, - { "NIS_THREAD_GROUP_SIZE", sThreadGroupSize.c_str() }, - { "NIS_USE_HALF_PRECISION", sUseFP16.c_str() }, - { nullptr, nullptr } - }; - - Microsoft::WRL::ComPtr shaderBlob; - Microsoft::WRL::ComPtr errorBlob; - - HRESULT hr = D3DCompileFromFile( - fullShaderPath.c_str(), - defines, - D3D_COMPILE_STANDARD_FILE_INCLUDE, - "main", - "cs_5_0", - D3DCOMPILE_OPTIMIZATION_LEVEL3, - 0, - &shaderBlob, - &errorBlob - ); - - if (FAILED(hr)) { - if (errorBlob) { - Utils::Logf("NIS Shader compilation failed: %s\n", (char*)errorBlob->GetBufferPointer()); - } else { - Utils::Logf("NIS Shader compilation failed with HRESULT 0x%X\n", hr); - } - return false; - } - - DX::ThrowIfFailed(device->CreateComputeShader(shaderBlob->GetBufferPointer(), shaderBlob->GetBufferSize(), nullptr, m_nisShader.ReleaseAndGetAddressOf()), "Create NIS Compute Shader"); + auto shaderBlob = DX::ReadData(shaderPath.c_str()); + DX::ThrowIfFailed(device->CreateComputeShader(shaderBlob.data(), shaderBlob.size(), nullptr, m_nisShader.ReleaseAndGetAddressOf()), "Create NIS Compute Shader"); } catch (Platform::Exception^ e) { - Utils::Logf("Failed to compile or create NIS shader. HRESULT: 0x%X\n", e->HResult); + Utils::Logf("Failed to load NIS shader (%ls). HRESULT: 0x%X\n", shaderPath.c_str(), e->HResult); return false; } catch (...) { - Utils::Log("Failed to compile NIS shader with unknown exception\n"); + Utils::Log("Failed to load NIS shader with unknown exception\n"); return false; } diff --git a/moonlight-xbox-dx.vcxproj b/moonlight-xbox-dx.vcxproj index 04427a4b..34298a3f 100644 --- a/moonlight-xbox-dx.vcxproj +++ b/moonlight-xbox-dx.vcxproj @@ -1,4 +1,4 @@ - + @@ -618,15 +618,22 @@ true - + + + + true Document - + true Document - + + true + Document + + true Document diff --git a/moonlight-xbox-dx.vcxproj.filters b/moonlight-xbox-dx.vcxproj.filters index 15dc3741..d9592e37 100644 --- a/moonlight-xbox-dx.vcxproj.filters +++ b/moonlight-xbox-dx.vcxproj.filters @@ -687,6 +687,18 @@ Shaders + + Shaders + + + Shaders + + + Shaders + + + Shaders + From f58e45971945e27ef30f764337b3d4c6c8a15878 Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 23 Apr 2026 10:51:54 +0200 Subject: [PATCH 6/9] Remove debug logs --- Streaming/VideoRenderer.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Streaming/VideoRenderer.cpp b/Streaming/VideoRenderer.cpp index ebfc666c..0318b2e0 100644 --- a/Streaming/VideoRenderer.cpp +++ b/Streaming/VideoRenderer.cpp @@ -263,23 +263,6 @@ bool VideoRenderer::Render(AVFrame *frame) { Microsoft::WRL::ComPtr backBufferRes; backBufferRTV[0]->GetResource(backBufferRes.ReleaseAndGetAddressOf()); - Microsoft::WRL::ComPtr backBufferTex; - backBufferRes.As(&backBufferTex); - - D3D11_TEXTURE2D_DESC srcDesc, dstDesc, videoDesc; - upscaledTex->GetDesc(&srcDesc); - backBufferTex->GetDesc(&dstDesc); - m_VideoTexture->GetDesc(&videoDesc); - - static bool logged = false; - if (!logged) { - Utils::Logf("[Texture Sizes] Stream Input (m_VideoTexture): %dx%d | Upscaler Output (upscaledTex): %dx%d | Screen (BackBuffer): %dx%d\n", - videoDesc.Width, videoDesc.Height, - srcDesc.Width, srcDesc.Height, - dstDesc.Width, dstDesc.Height); - logged = true; - } - // Copy the upscaled texture to the backbuffer, using calculated offsets for centering ctx->CopySubresourceRegion(backBufferRes.Get(), 0, fsrDst.x, fsrDst.y, 0, upscaledTex.Get(), 0, nullptr); } From b5b90d946bd0069bb88d6a2dd528997bd409fb6d Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 23 Apr 2026 12:14:55 +0200 Subject: [PATCH 7/9] Fix batch script to ensure reliable execution from any working directory --- Assets/Shader/build_nis.bat | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Assets/Shader/build_nis.bat b/Assets/Shader/build_nis.bat index 42f75ac2..f0b61541 100644 --- a/Assets/Shader/build_nis.bat +++ b/Assets/Shader/build_nis.bat @@ -1,6 +1,10 @@ @echo off -set HLSL=..\..\third_party\NVIDIAImageScaling\NIS\NIS_Main.hlsl -fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=0 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=32 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=1 /Fo nis_sdr_fp16.cso %HLSL% -fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=2 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=32 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=1 /Fo nis_hdr_fp16.cso %HLSL% -fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=0 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=24 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=0 /Fo nis_sdr_fp32.cso %HLSL% -fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=2 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=24 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=0 /Fo nis_hdr_fp32.cso %HLSL% +setlocal +pushd "%~dp0" || exit /b 1 +set "HLSL=..\..\third_party\NVIDIAImageScaling\NIS\NIS_Main.hlsl" +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=0 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=32 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=1 /Fo "nis_sdr_fp16.cso" "%HLSL%" || exit /b 1 +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=2 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=32 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=1 /Fo "nis_hdr_fp16.cso" "%HLSL%" || exit /b 1 +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=0 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=24 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=0 /Fo "nis_sdr_fp32.cso" "%HLSL%" || exit /b 1 +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=2 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=24 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=0 /Fo "nis_hdr_fp32.cso" "%HLSL%" || exit /b 1 +popd +endlocal From d70b58df375fe93e7d06d0139b50e1ca067ff75b Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 23 Apr 2026 12:17:22 +0200 Subject: [PATCH 8/9] Release VSR resources during device teardown --- Streaming/VideoRenderer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Streaming/VideoRenderer.cpp b/Streaming/VideoRenderer.cpp index 0318b2e0..13781876 100644 --- a/Streaming/VideoRenderer.cpp +++ b/Streaming/VideoRenderer.cpp @@ -416,6 +416,10 @@ void VideoRenderer::ReleaseDeviceDependentResources() m_VideoVertexBuffer.Reset(); m_samplerState.Reset(); m_indexBuffer.Reset(); + m_intermediateTex.Reset(); + m_intermediateRTV.Reset(); + m_intermediateSRV.Reset(); + m_upscaler.reset(); } void VideoRenderer::scaleSourceToDestinationSurface(IRECT* src, IRECT* dst) From 0e563de4101bcc453013f4c6aec88a1ae3212141 Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 23 Apr 2026 13:20:36 +0200 Subject: [PATCH 9/9] Route fxc failures through cleanup before exiting --- Assets/Shader/build_nis.bat | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Assets/Shader/build_nis.bat b/Assets/Shader/build_nis.bat index f0b61541..c2eee052 100644 --- a/Assets/Shader/build_nis.bat +++ b/Assets/Shader/build_nis.bat @@ -2,9 +2,16 @@ setlocal pushd "%~dp0" || exit /b 1 set "HLSL=..\..\third_party\NVIDIAImageScaling\NIS\NIS_Main.hlsl" -fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=0 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=32 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=1 /Fo "nis_sdr_fp16.cso" "%HLSL%" || exit /b 1 -fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=2 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=32 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=1 /Fo "nis_hdr_fp16.cso" "%HLSL%" || exit /b 1 -fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=0 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=24 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=0 /Fo "nis_sdr_fp32.cso" "%HLSL%" || exit /b 1 -fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=2 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=24 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=0 /Fo "nis_hdr_fp32.cso" "%HLSL%" || exit /b 1 +set "EXIT_CODE=0" +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=0 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=32 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=1 /Fo "nis_sdr_fp16.cso" "%HLSL%" || goto :fail +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=2 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=32 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=1 /Fo "nis_hdr_fp16.cso" "%HLSL%" || goto :fail +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=0 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=24 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=0 /Fo "nis_sdr_fp32.cso" "%HLSL%" || goto :fail +fxc /T cs_5_0 /E main /O3 /D NIS_SCALER=1 /D NIS_HDR_MODE=2 /D NIS_BLOCK_WIDTH=32 /D NIS_BLOCK_HEIGHT=24 /D NIS_THREAD_GROUP_SIZE=128 /D NIS_USE_HALF_PRECISION=0 /Fo "nis_hdr_fp32.cso" "%HLSL%" || goto :fail +goto :cleanup + +:fail +set "EXIT_CODE=%ERRORLEVEL%" + +:cleanup popd -endlocal +endlocal & exit /b %EXIT_CODE%