diff --git a/OptiScaler/backends/IFeature.h b/OptiScaler/backends/IFeature.h index 377b6b9a..2ab34f39 100644 --- a/OptiScaler/backends/IFeature.h +++ b/OptiScaler/backends/IFeature.h @@ -76,7 +76,7 @@ public: bool ModuleLoaded() const { return _moduleLoaded; } long FrameCount() { return _frameCount; } - IFeature(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) + IFeature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) { SetHandle(InHandleId); _initParameters = SetInitParameters(InParameters); diff --git a/OptiScaler/backends/IFeature_Dx11.h b/OptiScaler/backends/IFeature_Dx11.h index 15f08357..a8c0cbdf 100644 --- a/OptiScaler/backends/IFeature_Dx11.h +++ b/OptiScaler/backends/IFeature_Dx11.h @@ -10,10 +10,10 @@ protected: inline static std::unique_ptr Imgui = nullptr; public: - virtual bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) = 0; - virtual bool Evaluate(ID3D11DeviceContext* DeviceContext, const NVSDK_NGX_Parameter* InParameters) = 0; + virtual bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) = 0; + virtual bool Evaluate(ID3D11DeviceContext* DeviceContext, NVSDK_NGX_Parameter* InParameters) = 0; - IFeature_Dx11(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) + IFeature_Dx11(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) { } diff --git a/OptiScaler/backends/IFeature_Dx11wDx12.cpp b/OptiScaler/backends/IFeature_Dx11wDx12.cpp index 07e09302..7032f93e 100644 --- a/OptiScaler/backends/IFeature_Dx11wDx12.cpp +++ b/OptiScaler/backends/IFeature_Dx11wDx12.cpp @@ -922,7 +922,7 @@ bool IFeature_Dx11wDx12::CopyBackOutput() return true; } -bool IFeature_Dx11wDx12::BaseInit(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) +bool IFeature_Dx11wDx12::BaseInit(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("IFeature_Dx11wDx12::BaseInit!"); @@ -974,7 +974,7 @@ bool IFeature_Dx11wDx12::BaseInit(ID3D11Device* InDevice, ID3D11DeviceContext* I return true; } -IFeature_Dx11wDx12::IFeature_Dx11wDx12(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters) +IFeature_Dx11wDx12::IFeature_Dx11wDx12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters) { } diff --git a/OptiScaler/backends/IFeature_Dx11wDx12.h b/OptiScaler/backends/IFeature_Dx11wDx12.h index ee178b9b..80fc299a 100644 --- a/OptiScaler/backends/IFeature_Dx11wDx12.h +++ b/OptiScaler/backends/IFeature_Dx11wDx12.h @@ -83,12 +83,12 @@ protected: void ReleaseSyncResources(); public: - virtual bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) = 0; - virtual bool Evaluate(ID3D11DeviceContext* DeviceContext, const NVSDK_NGX_Parameter* InParameters) = 0; + virtual bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) = 0; + virtual bool Evaluate(ID3D11DeviceContext* DeviceContext, NVSDK_NGX_Parameter* InParameters) = 0; - bool BaseInit(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters); + bool BaseInit(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters); - IFeature_Dx11wDx12(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters); + IFeature_Dx11wDx12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); ~IFeature_Dx11wDx12(); }; diff --git a/OptiScaler/backends/IFeature_Dx12.cpp b/OptiScaler/backends/IFeature_Dx12.cpp index 73de8541..2dc7bd59 100644 --- a/OptiScaler/backends/IFeature_Dx12.cpp +++ b/OptiScaler/backends/IFeature_Dx12.cpp @@ -13,7 +13,7 @@ void IFeature_Dx12::ResourceBarrier(ID3D12GraphicsCommandList* InCommandList, ID InCommandList->ResourceBarrier(1, &barrier); } -IFeature_Dx12::IFeature_Dx12(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) +IFeature_Dx12::IFeature_Dx12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) { } diff --git a/OptiScaler/backends/IFeature_Dx12.h b/OptiScaler/backends/IFeature_Dx12.h index df143bcd..01d5d8f0 100644 --- a/OptiScaler/backends/IFeature_Dx12.h +++ b/OptiScaler/backends/IFeature_Dx12.h @@ -21,10 +21,10 @@ protected: void ResourceBarrier(ID3D12GraphicsCommandList* InCommandList, ID3D12Resource* InResource, D3D12_RESOURCE_STATES InBeforeState, D3D12_RESOURCE_STATES InAfterState) const; public: - virtual bool Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) = 0; - virtual bool Evaluate(ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) = 0; + virtual bool Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) = 0; + virtual bool Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) = 0; - IFeature_Dx12(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters); + IFeature_Dx12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); void Shutdown() final; diff --git a/OptiScaler/backends/IFeature_Vk.h b/OptiScaler/backends/IFeature_Vk.h index 1922bcbf..0d5ae6c7 100644 --- a/OptiScaler/backends/IFeature_Vk.h +++ b/OptiScaler/backends/IFeature_Vk.h @@ -14,10 +14,10 @@ protected: PFN_vkGetDeviceProcAddr GDPA; public: - virtual bool Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, const NVSDK_NGX_Parameter* InParameters) = 0; - virtual bool Evaluate(VkCommandBuffer InCmdBuffer, const NVSDK_NGX_Parameter* InParameters) = 0; + virtual bool Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, NVSDK_NGX_Parameter* InParameters) = 0; + virtual bool Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* InParameters) = 0; - IFeature_Vk(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) + IFeature_Vk(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) { } diff --git a/OptiScaler/backends/fsr2/FSR2Feature.h b/OptiScaler/backends/fsr2/FSR2Feature.h index e7347369..75966db1 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature.h +++ b/OptiScaler/backends/fsr2/FSR2Feature.h @@ -65,7 +65,7 @@ public: feature_version Version() final { return _version; } const char* Name() override { return "FSR"; } - FSR2Feature(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) + FSR2Feature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) { _moduleLoaded = true; _lastFrameTime = MillisecondsNow(); diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp index 76bee3dd..3e27ca45 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp @@ -16,7 +16,7 @@ do { \ } \ } while((void)0, 0); -bool FSR2FeatureDx11::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureDx11::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureDx11::Init"); @@ -217,11 +217,11 @@ bool FSR2FeatureDx11::InitFSR2(const NVSDK_NGX_Parameter* InParameters) return true; } -FSR2FeatureDx11::FSR2FeatureDx11(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), FSR2Feature(InHandleId, InParameters) +FSR2FeatureDx11::FSR2FeatureDx11(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), FSR2Feature(InHandleId, InParameters) { } -bool FSR2FeatureDx11::Evaluate(ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureDx11::Evaluate(ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureDx11::Evaluate"); diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx11.h b/OptiScaler/backends/fsr2/FSR2Feature_Dx11.h index aaf019aa..e96a9559 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx11.h +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx11.h @@ -36,12 +36,12 @@ protected: bool InitFSR2(const NVSDK_NGX_Parameter* InParameters) override; public: - FSR2FeatureDx11(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters); + FSR2FeatureDx11(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); // Inherited via IFeature_Dx11 - bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) override; - bool Evaluate(ID3D11DeviceContext* DeviceContext, const NVSDK_NGX_Parameter* InParameters) override; + bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) override; + bool Evaluate(ID3D11DeviceContext* DeviceContext, NVSDK_NGX_Parameter* InParameters) override; ~FSR2FeatureDx11(); }; diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp index c4236566..cb0d7013 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp @@ -4,7 +4,7 @@ #include "FSR2Feature_Dx11on12.h" -bool FSR2FeatureDx11on12::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureDx11on12::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureDx11on12::Init!"); @@ -22,7 +22,7 @@ bool FSR2FeatureDx11on12::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InCo return true; } -bool FSR2FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureDx11on12::Evaluate"); diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.h b/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.h index 1a76bcfe..1cf15e81 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.h +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.h @@ -16,12 +16,12 @@ protected: public: const char* Name() final { return "FSR w/Dx12"; } - FSR2FeatureDx11on12(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : FSR2Feature(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), IFeature_Dx11wDx12(InHandleId, InParameters), IFeature(InHandleId, InParameters) + FSR2FeatureDx11on12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : FSR2Feature(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), IFeature_Dx11wDx12(InHandleId, InParameters), IFeature(InHandleId, InParameters) { } - bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) override; - bool Evaluate(ID3D11DeviceContext* InDeviceContext, const NVSDK_NGX_Parameter* InParameters) override; + bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) override; + bool Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_NGX_Parameter* InParameters) override; ~FSR2FeatureDx11on12(); }; \ No newline at end of file diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp index 814fd48a..cfbdac36 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp @@ -4,7 +4,7 @@ #include "FSR2Feature_Dx12.h" -bool FSR2FeatureDx12::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureDx12::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureDx12::Init"); @@ -27,7 +27,7 @@ bool FSR2FeatureDx12::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* In return false; } -bool FSR2FeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureDx12::Evaluate"); diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx12.h b/OptiScaler/backends/fsr2/FSR2Feature_Dx12.h index 9aeaa752..aa353b60 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx12.h +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx12.h @@ -13,12 +13,12 @@ protected: bool InitFSR2(const NVSDK_NGX_Parameter* InParameters); public: - FSR2FeatureDx12(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : FSR2Feature(InHandleId, InParameters), IFeature_Dx12(InHandleId, InParameters), IFeature(InHandleId, InParameters) + FSR2FeatureDx12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : FSR2Feature(InHandleId, InParameters), IFeature_Dx12(InHandleId, InParameters), IFeature(InHandleId, InParameters) { } - bool Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) override; - bool Evaluate(ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) override; + bool Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) override; + bool Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) override; ~FSR2FeatureDx12(); }; \ No newline at end of file diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp index 8cf77d75..89672aa8 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp @@ -124,7 +124,7 @@ bool FSR2FeatureVk::InitFSR2(const NVSDK_NGX_Parameter* InParameters) return true; } -bool FSR2FeatureVk::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureVk::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureVk::Init"); @@ -140,7 +140,7 @@ bool FSR2FeatureVk::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice return InitFSR2(InParameters); } -bool FSR2FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureVk::Evaluate"); diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Vk.h b/OptiScaler/backends/fsr2/FSR2Feature_Vk.h index befd064f..20e76521 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Vk.h +++ b/OptiScaler/backends/fsr2/FSR2Feature_Vk.h @@ -16,10 +16,10 @@ protected: bool InitFSR2(const NVSDK_NGX_Parameter* InParameters); public: - FSR2FeatureVk(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : FSR2Feature(InHandleId, InParameters), IFeature_Vk(InHandleId, InParameters), IFeature(InHandleId, InParameters) + FSR2FeatureVk(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : FSR2Feature(InHandleId, InParameters), IFeature_Vk(InHandleId, InParameters), IFeature(InHandleId, InParameters) { } - bool Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, const NVSDK_NGX_Parameter* InParameters) override; - bool Evaluate(VkCommandBuffer InCmdBuffer, const NVSDK_NGX_Parameter* InParameters) override; + bool Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, NVSDK_NGX_Parameter* InParameters) override; + bool Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* InParameters) override; }; diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_212.h b/OptiScaler/backends/fsr2_212/FSR2Feature_212.h index 7de05d2d..5a9e7e42 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_212.h +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_212.h @@ -51,7 +51,7 @@ public: feature_version Version() final { return _version; } const char* Name() override { return "FSR"; } - FSR2Feature212(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) + FSR2Feature212(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) { _moduleLoaded = true; _lastFrameTime = MillisecondsNow(); diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp index 6d67de9a..25c69b90 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp @@ -4,7 +4,7 @@ #include "FSR2Feature_Dx11on12_212.h" -bool FSR2FeatureDx11on12_212::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureDx11on12_212::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureDx11on12_212::Init!"); @@ -22,7 +22,7 @@ bool FSR2FeatureDx11on12_212::Init(ID3D11Device* InDevice, ID3D11DeviceContext* return true; } -bool FSR2FeatureDx11on12_212::Evaluate(ID3D11DeviceContext* InDeviceContext, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureDx11on12_212::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureDx11on12_212::Evaluate"); diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.h b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.h index 46439715..a005b5ab 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.h +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.h @@ -16,12 +16,12 @@ protected: public: const char* Name() final { return "FSR w/Dx12"; } - FSR2FeatureDx11on12_212(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : FSR2Feature212(InHandleId, InParameters), IFeature_Dx11wDx12(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), IFeature(InHandleId, InParameters) + FSR2FeatureDx11on12_212(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : FSR2Feature212(InHandleId, InParameters), IFeature_Dx11wDx12(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), IFeature(InHandleId, InParameters) { } - bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) override; - bool Evaluate(ID3D11DeviceContext* InDeviceContext, const NVSDK_NGX_Parameter* InParameters) override; + bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) override; + bool Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_NGX_Parameter* InParameters) override; ~FSR2FeatureDx11on12_212(); }; \ No newline at end of file diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp index 5aa8a1aa..0a40080b 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp @@ -4,7 +4,7 @@ #include "FSR2Feature_Dx12_212.h" -bool FSR2FeatureDx12_212::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureDx12_212::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureDx12_212::Init"); @@ -27,7 +27,7 @@ bool FSR2FeatureDx12_212::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList return false; } -bool FSR2FeatureDx12_212::Evaluate(ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureDx12_212::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureDx12_212::Evaluate"); diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.h b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.h index f1c6af52..48476994 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.h +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.h @@ -13,12 +13,12 @@ protected: bool InitFSR2(const NVSDK_NGX_Parameter* InParameters); public: - FSR2FeatureDx12_212(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : FSR2Feature212(InHandleId, InParameters), IFeature_Dx12(InHandleId, InParameters), IFeature(InHandleId, InParameters) + FSR2FeatureDx12_212(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : FSR2Feature212(InHandleId, InParameters), IFeature_Dx12(InHandleId, InParameters), IFeature(InHandleId, InParameters) { } - bool Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) override; - bool Evaluate(ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) override; + bool Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) override; + bool Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) override; ~FSR2FeatureDx12_212(); }; \ No newline at end of file diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp index ae750431..18101227 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp @@ -119,7 +119,7 @@ bool FSR2FeatureVk212::InitFSR2(const NVSDK_NGX_Parameter* InParameters) return true; } -bool FSR2FeatureVk212::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureVk212::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureVk212::Init"); @@ -135,7 +135,7 @@ bool FSR2FeatureVk212::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevi return InitFSR2(InParameters); } -bool FSR2FeatureVk212::Evaluate(VkCommandBuffer InCmdBuffer, const NVSDK_NGX_Parameter* InParameters) +bool FSR2FeatureVk212::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("FSR2FeatureVk212::Evaluate"); diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h index 537efd14..f378f567 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.h @@ -16,10 +16,10 @@ protected: bool InitFSR2(const NVSDK_NGX_Parameter* InParameters); public: - FSR2FeatureVk212(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : FSR2Feature212(InHandleId, InParameters), IFeature_Vk(InHandleId, InParameters), IFeature(InHandleId, InParameters) + FSR2FeatureVk212(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : FSR2Feature212(InHandleId, InParameters), IFeature_Vk(InHandleId, InParameters), IFeature(InHandleId, InParameters) { } - bool Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, const NVSDK_NGX_Parameter* InParameters) override; - bool Evaluate(VkCommandBuffer InCmdBuffer, const NVSDK_NGX_Parameter* InParameters) override; + bool Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, NVSDK_NGX_Parameter* InParameters) override; + bool Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* InParameters) override; }; diff --git a/OptiScaler/backends/xess/XeSSFeature.cpp b/OptiScaler/backends/xess/XeSSFeature.cpp index ffa669b7..02a9a12c 100644 --- a/OptiScaler/backends/xess/XeSSFeature.cpp +++ b/OptiScaler/backends/xess/XeSSFeature.cpp @@ -332,7 +332,7 @@ bool XeSSFeature::InitXeSS(ID3D12Device* device, const NVSDK_NGX_Parameter* InPa return true; } -XeSSFeature::XeSSFeature(unsigned int handleId, const NVSDK_NGX_Parameter* InParameters) : IFeature(handleId, InParameters) +XeSSFeature::XeSSFeature(unsigned int handleId, NVSDK_NGX_Parameter* InParameters) : IFeature(handleId, InParameters) { PRN_xessGetVersion ptrMemoryGetVersion = (PRN_xessGetVersion)DetourFindFunction("libxess.dll", "xessGetVersion"); PRN_xessGetVersion ptrDllGetVersion = nullptr; diff --git a/OptiScaler/backends/xess/XeSSFeature.h b/OptiScaler/backends/xess/XeSSFeature.h index 5e20c325..25151756 100644 --- a/OptiScaler/backends/xess/XeSSFeature.h +++ b/OptiScaler/backends/xess/XeSSFeature.h @@ -92,7 +92,7 @@ public: feature_version Version() final { return feature_version{ _xessVersion.major, _xessVersion.minor, _xessVersion.patch }; } const char* Name() override { return "XeSS"; } - XeSSFeature(unsigned int handleId, const NVSDK_NGX_Parameter* InParameters); + XeSSFeature(unsigned int handleId, NVSDK_NGX_Parameter* InParameters); ~XeSSFeature(); }; \ No newline at end of file diff --git a/OptiScaler/backends/xess/XeSSFeature_Dx11.cpp b/OptiScaler/backends/xess/XeSSFeature_Dx11.cpp index 5806cca5..f3e2a895 100644 --- a/OptiScaler/backends/xess/XeSSFeature_Dx11.cpp +++ b/OptiScaler/backends/xess/XeSSFeature_Dx11.cpp @@ -8,11 +8,11 @@ #include "../../d3dx/D3DX11tex.h" #endif -XeSSFeatureDx11::XeSSFeatureDx11(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : IFeature_Dx11wDx12(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), IFeature(InHandleId, InParameters), XeSSFeature(InHandleId, InParameters) +XeSSFeatureDx11::XeSSFeatureDx11(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature_Dx11wDx12(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), IFeature(InHandleId, InParameters), XeSSFeature(InHandleId, InParameters) { } -bool XeSSFeatureDx11::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) +bool XeSSFeatureDx11::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("XeSSFeatureDx11::Init!"); @@ -30,7 +30,7 @@ bool XeSSFeatureDx11::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContex return true; } -bool XeSSFeatureDx11::Evaluate(ID3D11DeviceContext* InDeviceContext, const NVSDK_NGX_Parameter* InParameters) +bool XeSSFeatureDx11::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("XeSSFeatureDx11::Evaluate"); diff --git a/OptiScaler/backends/xess/XeSSFeature_Dx11.h b/OptiScaler/backends/xess/XeSSFeature_Dx11.h index 21eaf142..754ca08c 100644 --- a/OptiScaler/backends/xess/XeSSFeature_Dx11.h +++ b/OptiScaler/backends/xess/XeSSFeature_Dx11.h @@ -12,11 +12,11 @@ private: protected: public: - XeSSFeatureDx11(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters); + XeSSFeatureDx11(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); const char* Name() override { return "XeSS w/Dx12"; } - bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, const NVSDK_NGX_Parameter* InParameters) override; - bool Evaluate(ID3D11DeviceContext* InDeviceContext, const NVSDK_NGX_Parameter* InParameters) override; + bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) override; + bool Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_NGX_Parameter* InParameters) override; ~XeSSFeatureDx11(); }; \ No newline at end of file diff --git a/OptiScaler/backends/xess/XeSSFeature_Dx12.cpp b/OptiScaler/backends/xess/XeSSFeature_Dx12.cpp index e2d5f410..8b41b491 100644 --- a/OptiScaler/backends/xess/XeSSFeature_Dx12.cpp +++ b/OptiScaler/backends/xess/XeSSFeature_Dx12.cpp @@ -4,7 +4,7 @@ #include "XeSSFeature_Dx12.h" -bool XeSSFeatureDx12::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) +bool XeSSFeatureDx12::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("XeSSFeatureDx12::Init"); @@ -27,7 +27,7 @@ bool XeSSFeatureDx12::Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* In return false; } -bool XeSSFeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) +bool XeSSFeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) { spdlog::debug("XeSSFeatureDx12::Evaluate"); diff --git a/OptiScaler/backends/xess/XeSSFeature_Dx12.h b/OptiScaler/backends/xess/XeSSFeature_Dx12.h index bb525a7c..771b24e6 100644 --- a/OptiScaler/backends/xess/XeSSFeature_Dx12.h +++ b/OptiScaler/backends/xess/XeSSFeature_Dx12.h @@ -10,12 +10,12 @@ private: protected: public: - XeSSFeatureDx12(unsigned int InHandleId, const NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters), IFeature_Dx12(InHandleId, InParameters), XeSSFeature(InHandleId, InParameters) + XeSSFeatureDx12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters), IFeature_Dx12(InHandleId, InParameters), XeSSFeature(InHandleId, InParameters) { } - bool Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) override; - bool Evaluate(ID3D12GraphicsCommandList* InCommandList, const NVSDK_NGX_Parameter* InParameters) override; + bool Init(ID3D12Device* InDevice, ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) override; + bool Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) override; ~XeSSFeatureDx12(); }; \ No newline at end of file diff --git a/external/nvngx_dlss_sdk/nvsdk_ngx.h b/external/nvngx_dlss_sdk/nvsdk_ngx.h index dd820022..a01000b7 100644 --- a/external/nvngx_dlss_sdk/nvsdk_ngx.h +++ b/external/nvngx_dlss_sdk/nvsdk_ngx.h @@ -364,7 +364,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_CUDA_GetScratchBufferSize(NV // NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_D3D11_CreateFeature(ID3D11DeviceContext *InDevCtx, NVSDK_NGX_Feature InFeatureID, NVSDK_NGX_Parameter *InParameters, NVSDK_NGX_Handle **OutHandle); NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_D3D12_CreateFeature(ID3D12GraphicsCommandList *InCmdList, NVSDK_NGX_Feature InFeatureID, NVSDK_NGX_Parameter *InParameters, NVSDK_NGX_Handle **OutHandle); -NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_CUDA_CreateFeature(NVSDK_NGX_Feature InFeatureID, const NVSDK_NGX_Parameter *InParameters, NVSDK_NGX_Handle **OutHandle); +NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_CUDA_CreateFeature(NVSDK_NGX_Feature InFeatureID, NVSDK_NGX_Parameter *InParameters, NVSDK_NGX_Handle **OutHandle); ///////////////////////////////////////////////////////////////////////// // NVSDK_NGX_Release @@ -439,9 +439,9 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_D3D12_GetFeatureRequirements #ifdef __cplusplus typedef void (NVSDK_CONV *PFN_NVSDK_NGX_ProgressCallback)(float InCurrentProgress, bool &OutShouldCancel); -NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_D3D11_EvaluateFeature(ID3D11DeviceContext *InDevCtx, const NVSDK_NGX_Handle *InFeatureHandle, const NVSDK_NGX_Parameter *InParameters, PFN_NVSDK_NGX_ProgressCallback InCallback = NULL); +NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_D3D11_EvaluateFeature(ID3D11DeviceContext *InDevCtx, const NVSDK_NGX_Handle *InFeatureHandle, NVSDK_NGX_Parameter *InParameters, PFN_NVSDK_NGX_ProgressCallback InCallback = NULL); NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_D3D12_EvaluateFeature(ID3D12GraphicsCommandList *InCmdList, const NVSDK_NGX_Handle *InFeatureHandle, NVSDK_NGX_Parameter *InParameters, PFN_NVSDK_NGX_ProgressCallback InCallback = NULL); -NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_CUDA_EvaluateFeature(const NVSDK_NGX_Handle *InFeatureHandle, const NVSDK_NGX_Parameter *InParameters, PFN_NVSDK_NGX_ProgressCallback InCallback = NULL); +NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_CUDA_EvaluateFeature(const NVSDK_NGX_Handle *InFeatureHandle, NVSDK_NGX_Parameter *InParameters, PFN_NVSDK_NGX_ProgressCallback InCallback = NULL); #endif typedef void (NVSDK_CONV *PFN_NVSDK_NGX_ProgressCallback_C)(float InCurrentProgress, bool *OutShouldCancel); diff --git a/external/nvngx_dlss_sdk/nvsdk_ngx_defs.h b/external/nvngx_dlss_sdk/nvsdk_ngx_defs.h index 3ccb5fa5..88cd7fa9 100644 --- a/external/nvngx_dlss_sdk/nvsdk_ngx_defs.h +++ b/external/nvngx_dlss_sdk/nvsdk_ngx_defs.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright (c) 2018-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2018-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * SPDX-License-Identifier: LicenseRef-NvidiaProprietary * * NVIDIA CORPORATION, its affiliates and licensors retain all intellectual @@ -16,8 +16,8 @@ #ifndef __cplusplus #include // For size_t -#include -#include +#include +#include #endif #ifdef __cplusplus @@ -35,7 +35,7 @@ extern "C" #if defined(NVSDK_NGX) && defined(_WIN32) #define NVSDK_NGX_API __declspec(dllexport) #else -#define NVSDK_NGX_API +#define NVSDK_NGX_API #endif #endif @@ -129,7 +129,7 @@ typedef enum NVSDK_NGX_Result // The feature or application was denied (contact NVIDIA for further details) NVSDK_NGX_Result_FAIL_Denied = NVSDK_NGX_Result_Fail | 17, - + // The feature or functionality is not implemented NVSDK_NGX_Result_FAIL_NotImplemented = NVSDK_NGX_Result_Fail | 18, } NVSDK_NGX_Result; @@ -162,15 +162,21 @@ typedef enum NVSDK_NGX_Feature NVSDK_NGX_Feature_DeepResolve = 10, NVSDK_NGX_Feature_FrameGeneration = 11, - - NVSDK_NGX_Feature_DeepDVC = 12, - NVSDK_NGX_Feature_Reserved13 = 13, + NVSDK_NGX_Feature_Reserved12 = 12, + + NVSDK_NGX_Feature_RayReconstruction = 13, + + NVSDK_NGX_Feature_Reserved14 = 14, + + NVSDK_NGX_Feature_Reserved15 = 15, + + NVSDK_NGX_Feature_Reserved16 = 16, // New features go here NVSDK_NGX_Feature_Count, - // These members are not strictly NGX features, but are + // These members are not strictly NGX features, but are // components of the NGX system, and it may sometimes // be useful to identify them using the same enum NVSDK_NGX_Feature_Reserved_SDK = 32764, @@ -217,12 +223,6 @@ typedef enum NVSDK_NGX_DLSS_Mode NVSDK_NGX_DLSS_Mode_DLSS, // DLSS will apply AA and upsample at the same time } NVSDK_NGX_DLSS_Mode; -typedef enum NVSDK_NGX_DeepDVC_Mode -{ - NVSDK_NGX_DLSS_DeepDVC_Mode_Off = 0, // No DeepDVC - NVSDK_NGX_DLSS_DeepDVC_Mode_On, // Minimal DeepDVC Integration for RT Effects -} NVSDK_NGX_DLSS_DeepDVC_Mode; - typedef struct NVSDK_NGX_Handle { unsigned int Id; } NVSDK_NGX_Handle; typedef enum NSDK_NGX_GPU_Arch @@ -250,6 +250,7 @@ typedef enum NVSDK_NGX_DLSS_Feature_Flags NVSDK_NGX_DLSS_Feature_Flags_Reserved_0 = 1 << 4, NVSDK_NGX_DLSS_Feature_Flags_DoSharpening = 1 << 5, NVSDK_NGX_DLSS_Feature_Flags_AutoExposure = 1 << 6, + NVSDK_NGX_DLSS_Feature_Flags_AlphaUpscaling = 1 << 7, } NVSDK_NGX_DLSS_Feature_Flags; typedef enum NVSDK_NGX_ToneMapperType @@ -291,10 +292,20 @@ typedef struct NVSDK_NGX_Dimensions unsigned int Height; } NVSDK_NGX_Dimensions; +typedef struct NVSDK_NGX_PrecisionInfo +{ + // 1 if and only if the associated resource buffer is considered low-precision + unsigned int IsLowPrecision; + + // Bias and Scale values, such that `hi = lo * Scale + Bias` + float Bias; + float Scale; +} NVSDK_NGX_PrecisionInfo; + typedef struct NVSDK_NGX_PathListInfo { // Pointer to a const string - wchar_t const * const * Path; + wchar_t const* const* Path; // Path-list length unsigned int Length; } NVSDK_NGX_PathListInfo; @@ -310,7 +321,7 @@ typedef enum NVSDK_NGX_Logging_Level // A logging callback provided by the app to allow piping log lines back to the app. // Please take careful note of the signature and calling convention. // The callback must be able to be called from any thread. -// It must also be fully thread-safe and any number of threads may call into it concurrently. +// It must also be fully thread-safe and any number of threads may call into it concurrently. // It must fully process message by the time it returns, and there is no guarantee that // message will still be valid or allocated after it returns. // message will be a null-terminated string and may contain multibyte characters. @@ -382,13 +393,13 @@ typedef enum NVSDK_NGX_Feature_Support_Result NVSDK_NGX_FeatureSupportResult_OSVersionBelowMinimumSupported = 8, NVSDK_NGX_FeatureSupportResult_NotImplemented = 16 } NVSDK_NGX_Feature_Support_Result; - + typedef enum NVSDK_NGX_Application_Identifier_Type { NVSDK_NGX_Application_Identifier_Type_Application_Id = 0, NVSDK_NGX_Application_Identifier_Type_Project_Id = 1, } NVSDK_NGX_Application_Identifier_Type; - + ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // NVSDK_NGX_ProjectIdDescription // ------------------------------------- @@ -415,7 +426,7 @@ typedef struct NVSDK_NGX_ProjectIdDescription NVSDK_NGX_EngineType EngineType; const char* EngineVersion; } NVSDK_NGX_ProjectIdDescription; - + ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // NVSDK_NGX_Application_Identifier // ------------------------------------- @@ -440,7 +451,7 @@ typedef struct NVSDK_NGX_Application_Identifier unsigned long long ApplicationId; } v; } NVSDK_NGX_Application_Identifier; - + ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // NVSDK_NGX_FeatureDiscoveryInfo // ------------------------------------- @@ -471,7 +482,7 @@ typedef struct NVSDK_NGX_FeatureDiscoveryInfo const wchar_t* ApplicationDataPath; const NVSDK_NGX_FeatureCommonInfo* FeatureInfo; } NVSDK_NGX_FeatureDiscoveryInfo; - + typedef struct NVSDK_NGX_FeatureRequirement { // Bitfield of bit shifted values specified in NVSDK_NGX_Feature_Support_Result. 0 if Feature is Supported. @@ -555,7 +566,10 @@ typedef struct NVSDK_NGX_FeatureRequirement #define NVSDK_NGX_EParameter_Deprecated_43 "#\x43" #define NVSDK_NGX_EParameter_OptLevel "#\x44" #define NVSDK_NGX_EParameter_IsDevSnippetBranch "#\x45" -#define NVSDK_NGX_EParameter_DeepDVC_Avalilable "#\x46" +#define NVSDK_NGX_EParameter_Reserved_46 "#\x46" +#define NVSDK_NGX_EParameter_Graphics_API "#\x47" +#define NVSDK_NGX_EParameter_Reserved_48 "#\x48" +#define NVSDK_NGX_EParameter_Reserved_49 "#\x49" #define NVSDK_NGX_Parameter_OptLevel "Snippet.OptLevel" #define NVSDK_NGX_Parameter_IsDevSnippetBranch "Snippet.IsDevBranch" @@ -568,7 +582,6 @@ typedef struct NVSDK_NGX_FeatureRequirement #define NVSDK_NGX_Parameter_VideoSuperResolution_Available "VideoSuperResolution.Available" #define NVSDK_NGX_Parameter_ImageSignalProcessing_Available "ImageSignalProcessing.Available" #define NVSDK_NGX_Parameter_DeepResolve_Available "DeepResolve.Available" -#define NVSDK_NGX_Parameter_DeepDVC_Available "DeepDVC.Available" #define NVSDK_NGX_Parameter_SuperSampling_NeedsUpdatedDriver "SuperSampling.NeedsUpdatedDriver" #define NVSDK_NGX_Parameter_InPainting_NeedsUpdatedDriver "InPainting.NeedsUpdatedDriver" #define NVSDK_NGX_Parameter_ImageSuperResolution_NeedsUpdatedDriver "ImageSuperResolution.NeedsUpdatedDriver" @@ -576,7 +589,6 @@ typedef struct NVSDK_NGX_FeatureRequirement #define NVSDK_NGX_Parameter_VideoSuperResolution_NeedsUpdatedDriver "VideoSuperResolution.NeedsUpdatedDriver" #define NVSDK_NGX_Parameter_ImageSignalProcessing_NeedsUpdatedDriver "ImageSignalProcessing.NeedsUpdatedDriver" #define NVSDK_NGX_Parameter_DeepResolve_NeedsUpdatedDriver "DeepResolve.NeedsUpdatedDriver" -#define NVSDK_NGX_Parameter_DeepDVC_NeedsUpdatedDriver "DeepDVC.NeedsUpdatedDriver" #define NVSDK_NGX_Parameter_FrameInterpolation_NeedsUpdatedDriver "FrameInterpolation.NeedsUpdatedDriver" #define NVSDK_NGX_Parameter_SuperSampling_MinDriverVersionMajor "SuperSampling.MinDriverVersionMajor" #define NVSDK_NGX_Parameter_InPainting_MinDriverVersionMajor "InPainting.MinDriverVersionMajor" @@ -585,7 +597,6 @@ typedef struct NVSDK_NGX_FeatureRequirement #define NVSDK_NGX_Parameter_VideoSuperResolution_MinDriverVersionMajor "VideoSuperResolution.MinDriverVersionMajor" #define NVSDK_NGX_Parameter_ImageSignalProcessing_MinDriverVersionMajor "ImageSignalProcessing.MinDriverVersionMajor" #define NVSDK_NGX_Parameter_DeepResolve_MinDriverVersionMajor "DeepResolve.MinDriverVersionMajor" -#define NVSDK_NGX_Parameter_DeepDVC_MinDriverVersionMajor "DeepDVC.MinDriverVersionMajor" #define NVSDK_NGX_Parameter_FrameInterpolation_MinDriverVersionMajor "FrameInterpolation.MinDriverVersionMajor" #define NVSDK_NGX_Parameter_SuperSampling_MinDriverVersionMinor "SuperSampling.MinDriverVersionMinor" #define NVSDK_NGX_Parameter_InPainting_MinDriverVersionMinor "InPainting.MinDriverVersionMinor" @@ -594,7 +605,6 @@ typedef struct NVSDK_NGX_FeatureRequirement #define NVSDK_NGX_Parameter_VideoSuperResolution_MinDriverVersionMinor "VideoSuperResolution.MinDriverVersionMinor" #define NVSDK_NGX_Parameter_ImageSignalProcessing_MinDriverVersionMinor "ImageSignalProcessing.MinDriverVersionMinor" #define NVSDK_NGX_Parameter_DeepResolve_MinDriverVersionMinor "DeepResolve.MinDriverVersionMinor" -#define NVSDK_NGX_Parameter_DeepDVC_MinDriverVersionMinor "DeepDVC.MinDriverVersionMinor" #define NVSDK_NGX_Parameter_SuperSampling_FeatureInitResult "SuperSampling.FeatureInitResult" #define NVSDK_NGX_Parameter_InPainting_FeatureInitResult "InPainting.FeatureInitResult" #define NVSDK_NGX_Parameter_ImageSuperResolution_FeatureInitResult "ImageSuperResolution.FeatureInitResult" @@ -602,13 +612,11 @@ typedef struct NVSDK_NGX_FeatureRequirement #define NVSDK_NGX_Parameter_VideoSuperResolution_FeatureInitResult "VideoSuperResolution.FeatureInitResult" #define NVSDK_NGX_Parameter_ImageSignalProcessing_FeatureInitResult "ImageSignalProcessing.FeatureInitResult" #define NVSDK_NGX_Parameter_DeepResolve_FeatureInitResult "DeepResolve.FeatureInitResult" -#define NVSDK_NGX_Parameter_DeepDVC_FeatureInitResult "DeepDVC.FeatureInitResult" #define NVSDK_NGX_Parameter_FrameInterpolation_FeatureInitResult "FrameInterpolation.FeatureInitResult" #define NVSDK_NGX_Parameter_ImageSuperResolution_ScaleFactor_2_1 "ImageSuperResolution.ScaleFactor.2.1" #define NVSDK_NGX_Parameter_ImageSuperResolution_ScaleFactor_3_1 "ImageSuperResolution.ScaleFactor.3.1" #define NVSDK_NGX_Parameter_ImageSuperResolution_ScaleFactor_3_2 "ImageSuperResolution.ScaleFactor.3.2" #define NVSDK_NGX_Parameter_ImageSuperResolution_ScaleFactor_4_3 "ImageSuperResolution.ScaleFactor.4.3" -#define NVSDK_NGX_Parameter_DeepDVC_Strength "DeepDVC.Strength" #define NVSDK_NGX_Parameter_NumFrames "NumFrames" #define NVSDK_NGX_Parameter_Scale "Scale" #define NVSDK_NGX_Parameter_Width "Width" @@ -631,6 +639,7 @@ typedef struct NVSDK_NGX_FeatureRequirement #define NVSDK_NGX_Parameter_FI_Color2 "Color2" #define NVSDK_NGX_Parameter_Albedo "Albedo" #define NVSDK_NGX_Parameter_Output "Output" +#define NVSDK_NGX_Parameter_Output_Format "Output.Format" #define NVSDK_NGX_Parameter_Output_SizeInBytes "Output.SizeInBytes" #define NVSDK_NGX_Parameter_FI_Output1 "Output1" #define NVSDK_NGX_Parameter_FI_Output2 "Output2" @@ -644,6 +653,10 @@ typedef struct NVSDK_NGX_FeatureRequirement #define NVSDK_NGX_Parameter_Rect_Y "Rect.Y" #define NVSDK_NGX_Parameter_Rect_W "Rect.W" #define NVSDK_NGX_Parameter_Rect_H "Rect.H" +#define NVSDK_NGX_Parameter_OutRect_X "OutRect.X" +#define NVSDK_NGX_Parameter_OutRect_Y "OutRect.Y" +#define NVSDK_NGX_Parameter_OutRect_W "OutRect.W" +#define NVSDK_NGX_Parameter_OutRect_H "OutRect.H" #define NVSDK_NGX_Parameter_MV_Scale_X "MV.Scale.X" #define NVSDK_NGX_Parameter_MV_Scale_Y "MV.Scale.Y" #define NVSDK_NGX_Parameter_Model "Model" @@ -734,6 +747,13 @@ typedef struct NVSDK_NGX_FeatureRequirement #define NVSDK_NGX_Parameter_DLSS_INV_VIEW_PROJECTION_MATRIX "InvViewProjectionMatrix" #define NVSDK_NGX_Parameter_DLSS_CLIP_TO_PREV_CLIP_MATRIX "ClipToPrevClipMatrix" +#define NVSDK_NGX_Parameter_DLSS_TransparencyLayer "DLSS.TransparencyLayer" +#define NVSDK_NGX_Parameter_DLSS_TransparencyLayer_Subrect_Base_X "DLSS.TransparencyLayer.Subrect.Base.X" +#define NVSDK_NGX_Parameter_DLSS_TransparencyLayer_Subrect_Base_Y "DLSS.TransparencyLayer.Subrect.Base.Y" +#define NVSDK_NGX_Parameter_DLSS_TransparencyLayerOpacity "DLSS.TransparencyLayerOpacity" +#define NVSDK_NGX_Parameter_DLSS_TransparencyLayerOpacity_Subrect_Base_X "DLSS.TransparencyLayerOpacity.Subrect.Base.X" +#define NVSDK_NGX_Parameter_DLSS_TransparencyLayerOpacity_Subrect_Base_Y "DLSS.TransparencyLayerOpacity.Subrect.Base.Y" + #define NVSDK_NGX_Parameter_DLSS_Get_Dynamic_Max_Render_Width "DLSS.Get.Dynamic.Max.Render.Width" #define NVSDK_NGX_Parameter_DLSS_Get_Dynamic_Max_Render_Height "DLSS.Get.Dynamic.Max.Render.Height" #define NVSDK_NGX_Parameter_DLSS_Get_Dynamic_Min_Render_Width "DLSS.Get.Dynamic.Min.Render.Width" @@ -750,4 +770,4 @@ typedef struct NVSDK_NGX_FeatureRequirement } // extern "C" #endif -#endif +#endif \ No newline at end of file diff --git a/external/nvngx_dlss_sdk/nvsdk_ngx_vk.h b/external/nvngx_dlss_sdk/nvsdk_ngx_vk.h index 5ea684b1..def902b0 100644 --- a/external/nvngx_dlss_sdk/nvsdk_ngx_vk.h +++ b/external/nvngx_dlss_sdk/nvsdk_ngx_vk.h @@ -542,7 +542,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_VULKAN_GetFeatureDeviceExten #ifdef __cplusplus typedef void (NVSDK_CONV *PFN_NVSDK_NGX_ProgressCallback)(float InCurrentProgress, bool &OutShouldCancel); -NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_VULKAN_EvaluateFeature(VkCommandBuffer InCmdList, const NVSDK_NGX_Handle *InFeatureHandle, const NVSDK_NGX_Parameter *InParameters, PFN_NVSDK_NGX_ProgressCallback InCallback = NULL); +NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_VULKAN_EvaluateFeature(VkCommandBuffer InCmdList, const NVSDK_NGX_Handle *InFeatureHandle, NVSDK_NGX_Parameter *InParameters, PFN_NVSDK_NGX_ProgressCallback InCallback = NULL); #endif typedef void (NVSDK_CONV *PFN_NVSDK_NGX_ProgressCallback_C)(float InCurrentProgress, bool *OutShouldCancel); NVSDK_NGX_API NVSDK_NGX_Result NVSDK_CONV NVSDK_NGX_VULKAN_EvaluateFeature_C(VkCommandBuffer InCmdList, const NVSDK_NGX_Handle *InFeatureHandle, const NVSDK_NGX_Parameter *InParameters, PFN_NVSDK_NGX_ProgressCallback_C InCallback);