diff --git a/OptiScaler/SysUtils.h b/OptiScaler/SysUtils.h index a284c260..f6ef374a 100644 --- a/OptiScaler/SysUtils.h +++ b/OptiScaler/SysUtils.h @@ -30,6 +30,8 @@ #define BUFFER_COUNT 4 +#define OPTI_GUID "0F71CA1E-5CA1-E42A-AC1E-5CA1E0A11E55" + // Enables logging of DLSS NV Parameters // #define DLSS_PARAM_DUMP diff --git a/OptiScaler/inputs/FSR2_Dx11.cpp b/OptiScaler/inputs/FSR2_Dx11.cpp index 33a080b8..81de3223 100644 --- a/OptiScaler/inputs/FSR2_Dx11.cpp +++ b/OptiScaler/inputs/FSR2_Dx11.cpp @@ -249,7 +249,7 @@ static FfxErrorCode ffxFsr2ContextCreate_Dx11(FfxFsr2Context* context, FfxFsr2Co fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_D3D11_Init_with_ProjectID( - "OptiScaler", state.NVNGX_Engine, VER_PRODUCT_VERSION_STR, exePath.c_str(), _d3d11Device, &fcInfo, + OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d11Device, &fcInfo, state.NVNGX_Version == 0 ? NVSDK_NGX_Version_API : state.NVNGX_Version); if (nvResult != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/inputs/FSR2_Dx12.cpp b/OptiScaler/inputs/FSR2_Dx12.cpp index b2719ce3..be5eacfd 100644 --- a/OptiScaler/inputs/FSR2_Dx12.cpp +++ b/OptiScaler/inputs/FSR2_Dx12.cpp @@ -443,7 +443,7 @@ static Fsr212::FfxErrorCode ffxFsr2ContextCreate_Dx12(Fsr212::FfxFsr2Context* co fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID( - "OptiScaler", state.NVNGX_Engine, VER_PRODUCT_VERSION_STR, exePath.c_str(), _d3d12Device, &fcInfo, + OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d12Device, &fcInfo, state.NVNGX_Version == 0 ? NVSDK_NGX_Version_API : state.NVNGX_Version); if (nvResult != NVSDK_NGX_Result_Success) @@ -558,7 +558,7 @@ static Fsr212::FfxErrorCode ffxFsr2ContextCreate_Pattern_Dx12(Fsr212::FfxFsr2Con fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID( - "OptiScaler", state.NVNGX_Engine, VER_PRODUCT_VERSION_STR, exePath.c_str(), _d3d12Device, &fcInfo, + OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d12Device, &fcInfo, state.NVNGX_Version == 0 ? NVSDK_NGX_Version_API : state.NVNGX_Version); if (nvResult != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/inputs/FSR2_Vk.cpp b/OptiScaler/inputs/FSR2_Vk.cpp index aff4146a..31c35b8b 100644 --- a/OptiScaler/inputs/FSR2_Vk.cpp +++ b/OptiScaler/inputs/FSR2_Vk.cpp @@ -371,8 +371,8 @@ static FfxErrorCode ffxFsr2ContextCreate_Vk(FfxFsr2Context* context, FfxFsr2Cont fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_VULKAN_Init_ProjectID_Ext( - "OptiScaler", state.NVNGX_Engine, VER_PRODUCT_VERSION_STR, exePath.c_str(), - State::Instance().VulkanInstance, _vkPhysicalDevice, _vkDevice, vkGetInstanceProcAddr, vkGetDeviceProcAddr, + OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), State::Instance().VulkanInstance, + _vkPhysicalDevice, _vkDevice, vkGetInstanceProcAddr, vkGetDeviceProcAddr, state.NVNGX_Version == 0 ? NVSDK_NGX_Version_API : state.NVNGX_Version, &fcInfo); if (nvResult != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/inputs/FSR3_Dx12.cpp b/OptiScaler/inputs/FSR3_Dx12.cpp index e109ebb3..9b48a1af 100644 --- a/OptiScaler/inputs/FSR3_Dx12.cpp +++ b/OptiScaler/inputs/FSR3_Dx12.cpp @@ -293,7 +293,7 @@ static Fsr3::FfxErrorCode ffxFsr3ContextCreate_Dx12(Fsr3::FfxFsr3UpscalerContext fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID( - "OptiScaler", state.NVNGX_Engine, VER_PRODUCT_VERSION_STR, exePath.c_str(), _d3d12Device, &fcInfo, + OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d12Device, &fcInfo, state.NVNGX_Version == 0 ? NVSDK_NGX_Version_API : state.NVNGX_Version); if (nvResult != NVSDK_NGX_Result_Success) @@ -524,7 +524,7 @@ ffxFsr3ContextCreate_Pattern_Dx12(Fsr3::FfxFsr3UpscalerContext* pContext, fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID( - "OptiScaler", state.NVNGX_Engine, VER_PRODUCT_VERSION_STR, exePath.c_str(), _d3d12Device, &fcInfo, + OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d12Device, &fcInfo, state.NVNGX_Version == 0 ? NVSDK_NGX_Version_API : state.NVNGX_Version); if (nvResult != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/inputs/FfxApiExe_Dx12.cpp b/OptiScaler/inputs/FfxApiExe_Dx12.cpp index 217c129a..3938895f 100644 --- a/OptiScaler/inputs/FfxApiExe_Dx12.cpp +++ b/OptiScaler/inputs/FfxApiExe_Dx12.cpp @@ -236,8 +236,8 @@ static ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateConte fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID( - "OptiScaler", State::Instance().NVNGX_Engine, VER_PRODUCT_VERSION_STR, exePath.c_str(), _d3d12Device, - &fcInfo, State::Instance().NVNGX_Version == 0 ? NVSDK_NGX_Version_API : State::Instance().NVNGX_Version); + OPTI_GUID, State::Instance().NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d12Device, &fcInfo, + State::Instance().NVNGX_Version == 0 ? NVSDK_NGX_Version_API : State::Instance().NVNGX_Version); if (nvResult != NVSDK_NGX_Result_Success) return FFX_API_RETURN_ERROR_RUNTIME_ERROR; diff --git a/OptiScaler/inputs/FfxApi_Dx12.cpp b/OptiScaler/inputs/FfxApi_Dx12.cpp index ff9c68db..88459d14 100644 --- a/OptiScaler/inputs/FfxApi_Dx12.cpp +++ b/OptiScaler/inputs/FfxApi_Dx12.cpp @@ -412,7 +412,7 @@ ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateContextDescH fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID( - "OptiScaler", state.NVNGX_Engine, VER_PRODUCT_VERSION_STR, exePath.c_str(), _d3d12Device, &fcInfo, + OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d12Device, &fcInfo, state.NVNGX_Version == 0 ? NVSDK_NGX_Version_API : state.NVNGX_Version); if (nvResult != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/inputs/FfxApi_Vk.cpp b/OptiScaler/inputs/FfxApi_Vk.cpp index 12a17157..eb66cfc3 100644 --- a/OptiScaler/inputs/FfxApi_Vk.cpp +++ b/OptiScaler/inputs/FfxApi_Vk.cpp @@ -430,9 +430,9 @@ ffxReturnCode_t ffxCreateContext_Vk(ffxContext* context, ffxCreateContextDescHea fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_VULKAN_Init_ProjectID_Ext( - "OptiScaler", State::Instance().NVNGX_Engine, VER_PRODUCT_VERSION_STR, exePath.c_str(), - State::Instance().VulkanInstance, _vkPhysicalDevice, _vkDevice, vkGetInstanceProcAddr, _vkDeviceProcAddress, - State::Instance().NVNGX_Version, &fcInfo); + OPTI_GUID, State::Instance().NVNGX_Engine, OPTI_VERSION, exePath.c_str(), State::Instance().VulkanInstance, + _vkPhysicalDevice, _vkDevice, vkGetInstanceProcAddr, _vkDeviceProcAddress, State::Instance().NVNGX_Version, + &fcInfo); if (nvResult != NVSDK_NGX_Result_Success) return FFX_API_RETURN_ERROR_RUNTIME_ERROR; diff --git a/OptiScaler/inputs/XeSS_Dx11.cpp b/OptiScaler/inputs/XeSS_Dx11.cpp index f377185a..276aa176 100644 --- a/OptiScaler/inputs/XeSS_Dx11.cpp +++ b/OptiScaler/inputs/XeSS_Dx11.cpp @@ -135,7 +135,7 @@ xess_result_t hk_xessD3D11CreateContext(ID3D11Device* device, xess_context_handl fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_D3D11_Init_with_ProjectID( - "OptiScaler", NVSDK_NGX_ENGINE_TYPE_CUSTOM, VER_PRODUCT_VERSION_STR, exePath.c_str(), device, &fcInfo, + OPTI_GUID, NVSDK_NGX_ENGINE_TYPE_CUSTOM, OPTI_VERSION, exePath.c_str(), device, &fcInfo, State::Instance().NVNGX_Version == 0 ? NVSDK_NGX_Version_API : State::Instance().NVNGX_Version); if (nvResult != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/inputs/XeSS_Dx12.cpp b/OptiScaler/inputs/XeSS_Dx12.cpp index c1bdfb1e..baef3269 100644 --- a/OptiScaler/inputs/XeSS_Dx12.cpp +++ b/OptiScaler/inputs/XeSS_Dx12.cpp @@ -136,7 +136,7 @@ xess_result_t hk_xessD3D12CreateContext(ID3D12Device* pDevice, xess_context_hand fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID( - "OptiScaler", NVSDK_NGX_ENGINE_TYPE_CUSTOM, VER_PRODUCT_VERSION_STR, exePath.c_str(), pDevice, &fcInfo, + OPTI_GUID, NVSDK_NGX_ENGINE_TYPE_CUSTOM, OPTI_VERSION, exePath.c_str(), pDevice, &fcInfo, State::Instance().NVNGX_Version == 0 ? NVSDK_NGX_Version_API : State::Instance().NVNGX_Version); if (nvResult != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/inputs/XeSS_Vulkan.cpp b/OptiScaler/inputs/XeSS_Vulkan.cpp index 949e7705..1ff17299 100644 --- a/OptiScaler/inputs/XeSS_Vulkan.cpp +++ b/OptiScaler/inputs/XeSS_Vulkan.cpp @@ -164,9 +164,8 @@ xess_result_t hk_xessVKCreateContext(VkInstance instance, VkPhysicalDevice physi fcInfo.PathListInfo.Length = (int) pathStorage.size(); auto nvResult = NVSDK_NGX_VULKAN_Init_ProjectID_Ext( - "OptiScaler", NVSDK_NGX_ENGINE_TYPE_CUSTOM, VER_PRODUCT_VERSION_STR, exePath.c_str(), _instance, - _physicalDevice, _device, vkGetInstanceProcAddr, vkGetDeviceProcAddr, State::Instance().NVNGX_Version, - &fcInfo); + OPTI_GUID, NVSDK_NGX_ENGINE_TYPE_CUSTOM, OPTI_VERSION, exePath.c_str(), _instance, _physicalDevice, _device, + vkGetInstanceProcAddr, vkGetDeviceProcAddr, State::Instance().NVNGX_Version, &fcInfo); if (nvResult != NVSDK_NGX_Result_Success) return XESS_RESULT_ERROR_UNINITIALIZED; diff --git a/OptiScaler/resource.h b/OptiScaler/resource.h index 036b4ac5..171c1525 100644 --- a/OptiScaler/resource.h +++ b/OptiScaler/resource.h @@ -37,6 +37,9 @@ #define VER_FILE_VERSION_STR \ STRINGIZE(VER_MAJOR_VERSION) "." STRINGIZE(VER_MINOR_VERSION) "." STRINGIZE(VER_HOTFIX_VERSION) "." STRINGIZE(VER_BUILD_NUMBER) +#define OPTI_VERSION STRINGIZE(VER_MAJOR_VERSION) "." STRINGIZE(VER_MINOR_VERSION) "." STRINGIZE(VER_HOTFIX_VERSION) + + #define VER_PRODUCT_VERSION VER_FILE_VERSION #ifdef VER_PRE_RELEASE