From f877e222cdf4ea91ee9768855fa80399f9a73789 Mon Sep 17 00:00:00 2001 From: hoshinohikari Date: Mon, 15 Jan 2024 17:25:30 +0800 Subject: [PATCH 1/3] Resolve issues that arise while compiling the code --- NVEncCore/rgy_prm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NVEncCore/rgy_prm.h b/NVEncCore/rgy_prm.h index 1fc92212..2fca7069 100644 --- a/NVEncCore/rgy_prm.h +++ b/NVEncCore/rgy_prm.h @@ -619,7 +619,7 @@ const CX_DESC list_vpp_nnedi_error_type[] = { { NULL, 0 } }; -const CX_DESC list_vpp_deband[] = { +/*const CX_DESC list_vpp_deband[] = { { _T("0 - 1点参照"), 0 }, { _T("1 - 2点参照"), 1 }, { _T("2 - 4点参照"), 2 }, @@ -632,7 +632,7 @@ const CX_DESC list_vpp_deband_en[] = { { _T("2 - 4pixel ref"), 2 }, { NULL, 0 } }; -static_assert(_countof(list_vpp_deband) == _countof(list_vpp_deband_en), "_countof(list_vpp_deband) == _countof(list_vpp_deband_en)"); +static_assert(_countof(list_vpp_deband) == _countof(list_vpp_deband_en), "_countof(list_vpp_deband) == _countof(list_vpp_deband_en)");*/ const CX_DESC list_vpp_rotate[] = { { _T("90"), 90 }, From 4985e51cc57b3a6891592df090c6a8d9c72f6cdb Mon Sep 17 00:00:00 2001 From: hoshinohikari Date: Mon, 15 Jan 2024 17:31:06 +0800 Subject: [PATCH 2/3] Add cuda 11.8 support --- cudaver.props | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cudaver.props b/cudaver.props index 9e3eeed2..1ca68a05 100644 --- a/cudaver.props +++ b/cudaver.props @@ -106,6 +106,13 @@ compute_50,compute_50;compute_61,compute_61;compute_75,compute_75;compute_86,compute_86 nvrtc64_117_0.dll + + 11 + 8 + $(CUDA_MAJOR_VER).$(CUDA_MINOR_VER) + compute_50,compute_50;compute_61,compute_61;compute_75,compute_75;compute_86,compute_86 + nvrtc64_118_0.dll + 12 0 From d0e8d22a9a87fc5ebade8c76beed7e04572d3768 Mon Sep 17 00:00:00 2001 From: hoshinohikari Date: Mon, 15 Jan 2024 18:08:35 +0800 Subject: [PATCH 3/3] fix error --- NVEncCore/NVEncFilterResize.cu | 3 +++ cudaver.props | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NVEncCore/NVEncFilterResize.cu b/NVEncCore/NVEncFilterResize.cu index 45ffdd1a..2e5930dc 100644 --- a/NVEncCore/NVEncFilterResize.cu +++ b/NVEncCore/NVEncFilterResize.cu @@ -102,6 +102,9 @@ const TCHAR *NVRTC_BUILTIN_DLL_NAME_TSTR = _T("nvrtc-builtins64_116.dll"); #elif __CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ == 7 const TCHAR *NVRTC_DLL_NAME_TSTR = _T("nvrtc64_117_0.dll"); const TCHAR *NVRTC_BUILTIN_DLL_NAME_TSTR = _T("nvrtc-builtins64_117.dll"); +#elif __CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ == 8 +const TCHAR* NVRTC_DLL_NAME_TSTR = _T("nvrtc64_112_0.dll"); +const TCHAR* NVRTC_BUILTIN_DLL_NAME_TSTR = _T("nvrtc-builtins64_118.dll"); #elif __CUDACC_VER_MAJOR__ == 12 && __CUDACC_VER_MINOR__ == 0 const TCHAR *NVRTC_DLL_NAME_TSTR = _T("nvrtc64_120_0.dll"); const TCHAR *NVRTC_BUILTIN_DLL_NAME_TSTR = _T("nvrtc-builtins64_120.dll"); diff --git a/cudaver.props b/cudaver.props index 1ca68a05..5e04d84d 100644 --- a/cudaver.props +++ b/cudaver.props @@ -111,7 +111,7 @@ 8 $(CUDA_MAJOR_VER).$(CUDA_MINOR_VER) compute_50,compute_50;compute_61,compute_61;compute_75,compute_75;compute_86,compute_86 - nvrtc64_118_0.dll + nvrtc64_112_0.dll 12