Closed dboleslawski closed 3 years ago
Atrix256
commented
3 years ago Try doing this: git apply --reject --whitespace=fix foo.patch
where "foo.patch" is the patch file you are using. Anything that it couldn't figure out how to apply will end up in files ending in ".rej" but there may not end up being any.
I'm not sure why it's rejecting the patch, but it may have to do with local changes if you have any of those?
Let us know how that works though. Thanks!
dboleslawski
commented
3 years ago Heyhey, thanks for the quick answer. Just tried that but didn't seem to work, similiar/same issues. Cloning a clean repo and will try again.
Atrix256
commented
3 years ago If it doesn't work, let me know which specific patch file you are using. (thanks for the commit links, btw!)
dboleslawski
commented
3 years ago Hm! This is what I'm getting with a clean repo and the --reject --whitespace=fix flags:
PS D:\HYPERBOWL\NvRTX> git apply --reject --whitespace=fix .\RTXGI-NvRTX4.25.4.patch
./RTXGI-NvRTX4.25.4.patch:34: trailing whitespace.
"Win64",
./RTXGI-NvRTX4.25.4.patch:315: trailing whitespace.
#define PreIntegratedGF ReflectionStruct.PreIntegratedGF
./RTXGI-NvRTX4.25.4.patch:316: trailing whitespace.
#define PreIntegratedGFSampler ReflectionStruct.PreIntegratedGFSampler
./RTXGI-NvRTX4.25.4.patch:320: trailing whitespace.
#include "/Engine/Private/PathTracing/Utilities/PathTracingRandomSequence.ush"
./RTXGI-NvRTX4.25.4.patch:399: trailing whitespace.
DDGIVolume.numRaysPerProbe = DDGIVolume_NumRaysPerProbe;
Checking patch Engine/Binaries/ThirdParty/NVIDIA/NGX/Win64/nvngx_dlss.dll...
error: cannot apply binary patch to 'Engine/Binaries/ThirdParty/NVIDIA/NGX/Win64/nvngx_dlss.dll' without full index line
error: Engine/Binaries/ThirdParty/NVIDIA/NGX/Win64/nvngx_dlss.dll: patch does not apply
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/RTXGI.uplugin...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/ApplyLightingDeferred.usf...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/ProbeUpdateRGS.usf...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/ProbeViewRGS.usf...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/Common.ush...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/DDGIVolumeDefines.ush...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/Irradiance.ush...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/ProbeBlendingCS.usf...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/ProbeBorderUpdateCS.usf...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/ProbeCommon.ush...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/ProbeRelocationCS.usf...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/ProbeStateClassifierCS.usf...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDKDefines.ush...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/VisualizeDDGIProbes.usf...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIBlueprintLibrary.cpp...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIVolume.cpp...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIVolumeComponent.cpp...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIVolumeUpdate.cpp...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIVolumeUpdate.h...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIVolumeVisualize.cpp...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/RTXGIPlugin.cpp...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/RTXGIPluginSettings.cpp...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/RTXGIPluginSettings.h...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Public/DDGIBlueprintLibrary.h...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Public/DDGIVolume.h...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Public/DDGIVolumeComponent.h...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Public/RTXGIPlugin.h...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/RTXGI.Build.cs...
Checking patch Engine/Plugins/Runtime/Nvidia/RTXGI/UpdatingSDK.txt...
Checking patch Engine/Source/Developer/Windows/ShaderFormatD3D/Private/D3DShaderCompiler.cpp...
Checking patch Engine/Source/Runtime/D3D12RHI/Private/Windows/WindowsD3D12Device.cpp...
Checking patch Engine/Source/Runtime/RHI/Private/RHINGX.cpp...
Checking patch Engine/Source/Runtime/RHI/Public/RHIResources.h...
Checking patch Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.cpp...
Checking patch Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.h...
Checking patch Engine/Source/Runtime/Renderer/Private/IndirectLightRendering.cpp...
Checking patch Engine/Source/Runtime/Renderer/Private/PostProcess/DiaphragmDOF.cpp...
Checking patch Engine/Source/Runtime/Renderer/Private/RayTracing/RayTracingLighting.h...
Checking patch Engine/Source/Runtime/Renderer/Private/SceneVisibility.cpp...
Checking patch Engine/Source/Runtime/Renderer/Private/SystemTextures.h...
Checking patch Engine/Source/Runtime/Windows/D3D11RHI/Private/Windows/WindowsD3D11Device.cpp...
Checking patch Engine/Source/ThirdParty/NVIDIA/NGX/include/nvsdk_ngx.h...
Checking patch Engine/Source/ThirdParty/NVIDIA/NGX/include/nvsdk_ngx_defs.h...
Checking patch Engine/Source/ThirdParty/NVIDIA/NGX/include/nvsdk_ngx_helpers.h...
Checking patch Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_d.lib...
error: cannot apply binary patch to 'Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_d.lib' without full index line
error: Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_d.lib: patch does not apply
Checking patch Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_d_dbg.lib...
error: cannot apply binary patch to 'Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_d_dbg.lib' without full index line
error: Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_d_dbg.lib: patch does not apply
Checking patch Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_s.lib...
error: cannot apply binary patch to 'Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_s.lib' without full index line
error: Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_s.lib: patch does not apply
Checking patch Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_s_dbg.lib...
error: cannot apply binary patch to 'Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_s_dbg.lib' without full index line
error: Engine/Source/ThirdParty/NVIDIA/NGX/lib/nvsdk_ngx_s_dbg.lib: patch does not apply
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/RTXGI.uplugin cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/ApplyLightingDeferred.usf cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/ProbeUpdateRGS.usf cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/ProbeViewRGS.usf cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/Common.ush cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/DDGIVolumeDefines.ush cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/Irradiance.ush cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/ProbeBlendingCS.usf cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/ProbeBorderUpdateCS.usf cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/ProbeCommon.ush cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/ProbeRelocationCS.usf cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDK/ddgi/ProbeStateClassifierCS.usf cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/SDKDefines.ush cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Shaders/Private/VisualizeDDGIProbes.usf cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIBlueprintLibrary.cpp cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIVolume.cpp cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIVolumeComponent.cpp cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIVolumeUpdate.cpp cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIVolumeUpdate.h cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/DDGIVolumeVisualize.cpp cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/RTXGIPlugin.cpp cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/RTXGIPluginSettings.cpp cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Private/RTXGIPluginSettings.h cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Public/DDGIBlueprintLibrary.h cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Public/DDGIVolume.h cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Public/DDGIVolumeComponent.h cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/Public/RTXGIPlugin.h cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/Source/RTXGI/RTXGI.Build.cs cleanly.
Applied patch Engine/Plugins/Runtime/Nvidia/RTXGI/UpdatingSDK.txt cleanly.
Applied patch Engine/Source/Developer/Windows/ShaderFormatD3D/Private/D3DShaderCompiler.cpp cleanly.
Applied patch Engine/Source/Runtime/D3D12RHI/Private/Windows/WindowsD3D12Device.cpp cleanly.
Applied patch Engine/Source/Runtime/RHI/Private/RHINGX.cpp cleanly.
Applied patch Engine/Source/Runtime/RHI/Public/RHIResources.h cleanly.
Applied patch Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.cpp cleanly.
Applied patch Engine/Source/Runtime/Renderer/Private/DeferredShadingRenderer.h cleanly.
Applied patch Engine/Source/Runtime/Renderer/Private/IndirectLightRendering.cpp cleanly.
Applied patch Engine/Source/Runtime/Renderer/Private/PostProcess/DiaphragmDOF.cpp cleanly.
Applied patch Engine/Source/Runtime/Renderer/Private/RayTracing/RayTracingLighting.h cleanly.
Applied patch Engine/Source/Runtime/Renderer/Private/SceneVisibility.cpp cleanly.
Applied patch Engine/Source/Runtime/Renderer/Private/SystemTextures.h cleanly.
Applied patch Engine/Source/Runtime/Windows/D3D11RHI/Private/Windows/WindowsD3D11Device.cpp cleanly.
Applied patch Engine/Source/ThirdParty/NVIDIA/NGX/include/nvsdk_ngx.h cleanly.
Applied patch Engine/Source/ThirdParty/NVIDIA/NGX/include/nvsdk_ngx_defs.h cleanly.
Applied patch Engine/Source/ThirdParty/NVIDIA/NGX/include/nvsdk_ngx_helpers.h cleanly.As you can see on the first line I'm using the RTXGI-NvRTX4.25.4.patch with the rtx-dlss-4.25.4 branch of NvRTX :) Confusing to me, but I'm also very new to the concept of patches in git: the files that are throwing errors (like nvngx_dlss.dll) are completely missing now. I haven't checked before applying the patch, but git status is also not showing any removed files.
dboleslawski
commented
3 years ago Scratch that last comment, I was in the wrong folder oops.. nvngx_dlss.dll is definitely there!
scragnog
commented
3 years ago confirmed here. Same engine branch, same patch file, exact same reported errors.
Atrix256
commented
3 years ago Taking a look and we'll get a working patch up for that branch ASAP. Thanks :)
Atrix256
commented
3 years ago OK the patch is updated. I'm closing this out and it should work for you, but let us know if you hit any issues!
dboleslawski
commented
3 years ago works, thanks for the quick fix!!
octday
commented
3 years ago ？ What? You may send me the wrong e-mail.
发自我的iPhone
------------------ Original ------------------ From: dennis boleslawski <notifications@github.com> Date: Thu,Dec 3,2020 8:54 PM To: NVIDIAGameWorks/RTXGI <RTXGI@noreply.github.com> Cc: Subscribed <subscribed@noreply.github.com> Subject: Re: [NVIDIAGameWorks/RTXGI] Can't apply UE4 plugin patch to latest NvRTX UE4 branch (#26)
works, thanks for the quick fix!!
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or unsubscribe.
liuhui1986
commented
3 years ago Sorry
发自我的iPhone
------------------ Original ------------------ From: Jimmy <notifications@github.com> Date: Thu,Dec 3,2020 9:18 PM To: NVIDIAGameWorks/RTXGI <RTXGI@noreply.github.com> Cc: Subscribed <subscribed@noreply.github.com> Subject: Re: [NVIDIAGameWorks/RTXGI] Can't apply UE4 plugin patch to latest NvRTX UE4 branch (#26)
？ What? You may send me the wrong e-mail.
发自我的iPhone
------------------ Original ------------------ From: dennis boleslawski <notifications@github.com> Date: Thu,Dec 3,2020 8:54 PM To: NVIDIAGameWorks/RTXGI <RTXGI@noreply.github.com> Cc: Subscribed <subscribed@noreply.github.com> Subject: Re: [NVIDIAGameWorks/RTXGI] Can't apply UE4 plugin patch to latest NvRTX UE4 branch (#26)
works, thanks for the quick fix!!
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or unsubscribe. — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or unsubscribe.
I'm running into issues applying the UE4 plugin (commit) patch to the lastest NvRTX branch (commit). These errors are getting thrown when running --check or just plain apply.
Any pointers what I might be doing wrong? Many thanks in advance!