From b9a7d70a78240c00a49be44b35371ad901188340 Mon Sep 17 00:00:00 2001 From: cdozdil Date: Wed, 5 Jun 2024 21:54:52 +0300 Subject: [PATCH] use custom nvngx_params for dlss (to debug) --- OptiScaler/backends/dlss/DLSSFeature.h | 3 +- OptiScaler/backends/dlss/DLSSFeature_Dx11.cpp | 71 +++++++++---------- OptiScaler/backends/dlss/DLSSFeature_Dx12.cpp | 71 +++++++++---------- OptiScaler/backends/dlss/DLSSFeature_Vk.cpp | 50 ++++++------- 4 files changed, 97 insertions(+), 98 deletions(-) diff --git a/OptiScaler/backends/dlss/DLSSFeature.h b/OptiScaler/backends/dlss/DLSSFeature.h index b5eb7b39..b3f74ae6 100644 --- a/OptiScaler/backends/dlss/DLSSFeature.h +++ b/OptiScaler/backends/dlss/DLSSFeature.h @@ -2,6 +2,7 @@ #include "../IFeature.h" #include "../../pch.h" +#include "../../NVNGX_Parameter.h" #include typedef uint32_t(*PFN_NVSDK_NGX_GetSnippetVersion)(void); @@ -13,7 +14,7 @@ private: inline static HMODULE _nvngx = nullptr; protected: - NVSDK_NGX_Parameter* Parameters = nullptr; + NVSDK_NGX_Parameter* Parameters = GetNGXParameters(); NVSDK_NGX_Handle _dlssHandle = {}; NVSDK_NGX_Handle* _p_dlssHandle = nullptr; inline static bool _dlssInited = false; diff --git a/OptiScaler/backends/dlss/DLSSFeature_Dx11.cpp b/OptiScaler/backends/dlss/DLSSFeature_Dx11.cpp index ae20e4d5..e2a78425 100644 --- a/OptiScaler/backends/dlss/DLSSFeature_Dx11.cpp +++ b/OptiScaler/backends/dlss/DLSSFeature_Dx11.cpp @@ -13,7 +13,6 @@ bool DLSSFeatureDx11::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContex return false; } - HRESULT result; NVSDK_NGX_Result nvResult; bool initResult = false; @@ -59,35 +58,35 @@ bool DLSSFeatureDx11::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContex std::this_thread::sleep_for(std::chrono::milliseconds(500)); } - if (_AllocateParameters != nullptr) - { - spdlog::debug("DLSSFeatureDx11::Init _AllocateParameters will be used"); + //if (_AllocateParameters != nullptr) + //{ + // spdlog::debug("DLSSFeatureDx11::Init _AllocateParameters will be used"); - nvResult = _AllocateParameters(&Parameters); + // nvResult = _AllocateParameters(&Parameters); - if (nvResult != NVSDK_NGX_Result_Success) - { - spdlog::error("DLSSFeatureDx11::Init _AllocateParameters result: {0:X}", (unsigned int)nvResult); - break; - } - } - else if (_GetParameters != nullptr) - { - spdlog::debug("DLSSFeatureDx11::Init _GetParameters will be used"); + // if (nvResult != NVSDK_NGX_Result_Success) + // { + // spdlog::error("DLSSFeatureDx11::Init _AllocateParameters result: {0:X}", (unsigned int)nvResult); + // break; + // } + //} + //else if (_GetParameters != nullptr) + //{ + // spdlog::debug("DLSSFeatureDx11::Init _GetParameters will be used"); - nvResult = _GetParameters(&Parameters); + // nvResult = _GetParameters(&Parameters); - if (nvResult != NVSDK_NGX_Result_Success) - { - spdlog::error("DLSSFeatureDx11::Init _GetParameters result: {0:X}", (unsigned int)nvResult); - break; - } - } - else - { - spdlog::error("DLSSFeatureDx11::Init _AllocateParameters and _GetParameters are both nullptr!"); - break; - } + // if (nvResult != NVSDK_NGX_Result_Success) + // { + // spdlog::error("DLSSFeatureDx11::Init _GetParameters result: {0:X}", (unsigned int)nvResult); + // break; + // } + //} + //else + //{ + // spdlog::error("DLSSFeatureDx11::Init _AllocateParameters and _GetParameters are both nullptr!"); + // break; + //} spdlog::info("DLSSFeatureDx12::Evaluate Creating DLSS feature"); @@ -239,52 +238,52 @@ DLSSFeatureDx11::DLSSFeatureDx11(unsigned int InHandleId, const NVSDK_NGX_Parame _EvaluateFeature = (PFN_NVSDK_NGX_D3D11_EvaluateFeature)GetProcAddress(NVNGX(), "NVSDK_NGX_D3D11_EvaluateFeature"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _Init_with_ProjectID ptr: {0:X}", (unsigned long)_Init_with_ProjectID); + spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _Init_with_ProjectID ptr: {0:X}", (ULONG64)_Init_with_ProjectID); else spdlog::warn("DLSSFeatureDx11::DLSSFeatureDx11 _Init_with_ProjectID ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _Init_Ext ptr: {0:X}", (unsigned long)_Init_Ext); + spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _Init_Ext ptr: {0:X}", (ULONG64)_Init_Ext); else spdlog::warn("DLSSFeatureDx11::DLSSFeatureDx11 _Init_Ext ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _Shutdown ptr: {0:X}", (unsigned long)_Shutdown); + spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _Shutdown ptr: {0:X}", (ULONG64)_Shutdown); else spdlog::warn("DLSSFeatureDx11::DLSSFeatureDx11 _Shutdown ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _Shutdown1 ptr: {0:X}", (unsigned long)_Shutdown1); + spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _Shutdown1 ptr: {0:X}", (ULONG64)_Shutdown1); else spdlog::warn("DLSSFeatureDx11::DLSSFeatureDx11 _Shutdown1 ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _GetParameters ptr: {0:X}", (unsigned long)_GetParameters); + spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _GetParameters ptr: {0:X}", (ULONG64)_GetParameters); else spdlog::warn("DLSSFeatureDx11::DLSSFeatureDx11 _GetParameters ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _AllocateParameters ptr: {0:X}", (unsigned long)_AllocateParameters); + spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _AllocateParameters ptr: {0:X}", (ULONG64)_AllocateParameters); else spdlog::warn("DLSSFeatureDx11::DLSSFeatureDx11 _AllocateParameters ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _DestroyParameters ptr: {0:X}", (unsigned long)_DestroyParameters); + spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _DestroyParameters ptr: {0:X}", (ULONG64)_DestroyParameters); else spdlog::warn("DLSSFeatureDx11::DLSSFeatureDx11 _DestroyParameters ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _CreateFeature ptr: {0:X}", (unsigned long)_CreateFeature); + spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _CreateFeature ptr: {0:X}", (ULONG64)_CreateFeature); else spdlog::warn("DLSSFeatureDx11::DLSSFeatureDx11 _CreateFeature ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _ReleaseFeature ptr: {0:X}", (unsigned long)_ReleaseFeature); + spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _ReleaseFeature ptr: {0:X}", (ULONG64)_ReleaseFeature); else spdlog::warn("DLSSFeatureDx11::DLSSFeatureDx11 _ReleaseFeature ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _EvaluateFeature ptr: {0:X}", (unsigned long)_EvaluateFeature); + spdlog::trace("DLSSFeatureDx11::DLSSFeatureDx11 _EvaluateFeature ptr: {0:X}", (ULONG64)_EvaluateFeature); else spdlog::warn("DLSSFeatureDx11::DLSSFeatureDx11 _EvaluateFeature ptr: nullptr"); diff --git a/OptiScaler/backends/dlss/DLSSFeature_Dx12.cpp b/OptiScaler/backends/dlss/DLSSFeature_Dx12.cpp index b0352e3b..67c81524 100644 --- a/OptiScaler/backends/dlss/DLSSFeature_Dx12.cpp +++ b/OptiScaler/backends/dlss/DLSSFeature_Dx12.cpp @@ -13,7 +13,6 @@ bool DLSSFeatureDx12::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* In return false; } - HRESULT result; NVSDK_NGX_Result nvResult; bool initResult = false; @@ -60,35 +59,35 @@ bool DLSSFeatureDx12::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* In } - if (_AllocateParameters != nullptr) - { - spdlog::debug("DLSSFeatureDx12::Init _AllocateParameters will be used"); + //if (_AllocateParameters != nullptr) + //{ + // spdlog::debug("DLSSFeatureDx12::Init _AllocateParameters will be used"); - nvResult = _AllocateParameters(&Parameters); + // nvResult = _AllocateParameters(&Parameters); - if (nvResult != NVSDK_NGX_Result_Success) - { - spdlog::error("DLSSFeatureDx12::Init _AllocateParameters result: {0:X}", (unsigned int)nvResult); - break; - } - } - else if (_GetParameters != nullptr) - { - spdlog::debug("DLSSFeatureDx12::Init _GetParameters will be used"); + // if (nvResult != NVSDK_NGX_Result_Success) + // { + // spdlog::error("DLSSFeatureDx12::Init _AllocateParameters result: {0:X}", (unsigned int)nvResult); + // break; + // } + //} + //else if (_GetParameters != nullptr) + //{ + // spdlog::debug("DLSSFeatureDx12::Init _GetParameters will be used"); - nvResult = _GetParameters(&Parameters); + // nvResult = _GetParameters(&Parameters); - if (nvResult != NVSDK_NGX_Result_Success) - { - spdlog::error("DLSSFeatureDx12::Init _GetParameters result: {0:X}", (unsigned int)nvResult); - break; - } - } - else - { - spdlog::error("DLSSFeatureDx12::Init _AllocateParameters and _GetParameters are both nullptr!"); - break; - } + // if (nvResult != NVSDK_NGX_Result_Success) + // { + // spdlog::error("DLSSFeatureDx12::Init _GetParameters result: {0:X}", (unsigned int)nvResult); + // break; + // } + //} + //else + //{ + // spdlog::error("DLSSFeatureDx12::Init _AllocateParameters and _GetParameters are both nullptr!"); + // break; + //} spdlog::info("DLSSFeatureDx12::Evaluate Creating DLSS feature"); @@ -352,52 +351,52 @@ DLSSFeatureDx12::DLSSFeatureDx12(unsigned int InHandleId, const NVSDK_NGX_Parame _EvaluateFeature = (PFN_NVSDK_NGX_D3D12_EvaluateFeature)GetProcAddress(NVNGX(), "NVSDK_NGX_D3D12_EvaluateFeature"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _Init_with_ProjectID ptr: {0:X}", (unsigned long)_Init_with_ProjectID); + spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _Init_with_ProjectID ptr: {0:X}", (ULONG64)_Init_with_ProjectID); else spdlog::warn("DLSSFeatureDx12::DLSSFeatureDx12 _Init_with_ProjectID ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _Init_Ext ptr: {0:X}", (unsigned long)_Init_Ext); + spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _Init_Ext ptr: {0:X}", (ULONG64)_Init_Ext); else spdlog::warn("DLSSFeatureDx12::DLSSFeatureDx12 _Init_Ext ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _Shutdown ptr: {0:X}", (unsigned long)_Shutdown); + spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _Shutdown ptr: {0:X}", (ULONG64)_Shutdown); else spdlog::warn("DLSSFeatureDx12::DLSSFeatureDx12 _Shutdown ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _Shutdown1 ptr: {0:X}", (unsigned long)_Shutdown1); + spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _Shutdown1 ptr: {0:X}", (ULONG64)_Shutdown1); else spdlog::warn("DLSSFeatureDx12::DLSSFeatureDx12 _Shutdown1 ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _GetParameters ptr: {0:X}", (unsigned long)_GetParameters); + spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _GetParameters ptr: {0:X}", (ULONG64)_GetParameters); else spdlog::warn("DLSSFeatureDx12::DLSSFeatureDx12 _GetParameters ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _AllocateParameters ptr: {0:X}", (unsigned long)_AllocateParameters); + spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _AllocateParameters ptr: {0:X}", (ULONG64)_AllocateParameters); else spdlog::warn("DLSSFeatureDx12::DLSSFeatureDx12 _AllocateParameters ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _DestroyParameters ptr: {0:X}", (unsigned long)_DestroyParameters); + spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _DestroyParameters ptr: {0:X}", (ULONG64)_DestroyParameters); else spdlog::warn("DLSSFeatureDx12::DLSSFeatureDx12 _DestroyParameters ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _CreateFeature ptr: {0:X}", (unsigned long)_CreateFeature); + spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _CreateFeature ptr: {0:X}", (ULONG64)_CreateFeature); else spdlog::warn("DLSSFeatureDx12::DLSSFeatureDx12 _CreateFeature ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _ReleaseFeature ptr: {0:X}", (unsigned long)_ReleaseFeature); + spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _ReleaseFeature ptr: {0:X}", (ULONG64)_ReleaseFeature); else spdlog::warn("DLSSFeatureDx12::DLSSFeatureDx12 _ReleaseFeature ptr: nullptr"); if (_Init_with_ProjectID) - spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _EvaluateFeature ptr: {0:X}", (unsigned long)_EvaluateFeature); + spdlog::trace("DLSSFeatureDx12::DLSSFeatureDx12 _EvaluateFeature ptr: {0:X}", (ULONG64)_EvaluateFeature); else spdlog::warn("DLSSFeatureDx12::DLSSFeatureDx12 _EvaluateFeature ptr: nullptr"); diff --git a/OptiScaler/backends/dlss/DLSSFeature_Vk.cpp b/OptiScaler/backends/dlss/DLSSFeature_Vk.cpp index 71e72dce..954b08e4 100644 --- a/OptiScaler/backends/dlss/DLSSFeature_Vk.cpp +++ b/OptiScaler/backends/dlss/DLSSFeature_Vk.cpp @@ -61,35 +61,35 @@ bool DLSSFeatureVk::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice std::this_thread::sleep_for(std::chrono::milliseconds(500)); } - if (_AllocateParameters != nullptr) - { - spdlog::debug("DLSSFeatureVk::Init _AllocateParameters will be used"); + //if (_AllocateParameters != nullptr) + //{ + // spdlog::debug("DLSSFeatureVk::Init _AllocateParameters will be used"); - nvResult = _AllocateParameters(&Parameters); + // nvResult = _AllocateParameters(&Parameters); - if (nvResult != NVSDK_NGX_Result_Success) - { - spdlog::error("DLSSFeatureVk::Init _AllocateParameters result: {0:X}", (unsigned int)nvResult); - break; - } - } - else if (_GetParameters != nullptr) - { - spdlog::debug("DLSSFeatureVk::Init _GetParameters will be used"); + // if (nvResult != NVSDK_NGX_Result_Success) + // { + // spdlog::error("DLSSFeatureVk::Init _AllocateParameters result: {0:X}", (unsigned int)nvResult); + // break; + // } + //} + //else if (_GetParameters != nullptr) + //{ + // spdlog::debug("DLSSFeatureVk::Init _GetParameters will be used"); - nvResult = _GetParameters(&Parameters); + // nvResult = _GetParameters(&Parameters); - if (nvResult != NVSDK_NGX_Result_Success) - { - spdlog::error("DLSSFeatureVk::Init _GetParameters result: {0:X}", (unsigned int)nvResult); - break; - } - } - else - { - spdlog::error("DLSSFeatureVk::Init _AllocateParameters and _GetParameters are both nullptr!"); - break; - } + // if (nvResult != NVSDK_NGX_Result_Success) + // { + // spdlog::error("DLSSFeatureVk::Init _GetParameters result: {0:X}", (unsigned int)nvResult); + // break; + // } + //} + //else + //{ + // spdlog::error("DLSSFeatureVk::Init _AllocateParameters and _GetParameters are both nullptr!"); + // break; + //} spdlog::info("DLSSFeatureVk::Evaluate Creating DLSS feature");