diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-06 20:17:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-06 20:17:54 +0200 |
| commit | d838a4473589797264a1f9f5cd4de95604709d30 (patch) | |
| tree | 476781a8c6bc1cfcabc338c1feb9582c9673b3b8 /thirdparty/oidn/core/autoencoder.cpp | |
| parent | ce1811f9e207cc93b93f15bb40b585c809f7905d (diff) | |
| parent | dd79d1ce7847e7631ac56d28ca018c48bfae5af3 (diff) | |
Merge pull request #39340 from JFonS/upgrade_oidn
Upgrade OpenImageDenoise to v1.1.0
Diffstat (limited to 'thirdparty/oidn/core/autoencoder.cpp')
| -rw-r--r-- | thirdparty/oidn/core/autoencoder.cpp | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/thirdparty/oidn/core/autoencoder.cpp b/thirdparty/oidn/core/autoencoder.cpp index 8ae2421fa6..d8da684cb8 100644 --- a/thirdparty/oidn/core/autoencoder.cpp +++ b/thirdparty/oidn/core/autoencoder.cpp @@ -90,12 +90,19 @@ namespace oidn { if (!dirty) return; - { + // -- GODOT start -- + //device->executeTask([&]() + //{ + // GODOT end -- + if (mayiuse(avx512_common)) net = buildNet<16>(); else net = buildNet<8>(); - } + + // GODOT start -- + //}); + // GODOT end -- dirty = false; } @@ -107,8 +114,10 @@ namespace oidn { if (!net) return; - - { + // -- GODOT start -- + //device->executeTask([&]() + //{ + // -- GODOT end -- Progress progress; progress.func = progressFunc; progress.userPtr = progressUserPtr; @@ -154,7 +163,9 @@ namespace oidn { tileIndex++; } } - } + // -- GODOT start -- + //}); + // -- GODOT end -- } void AutoencoderFilter::computeTileSize() @@ -462,8 +473,11 @@ namespace oidn { return std::make_shared<GammaTransferFunction>(); } +// -- GODOT start -- // Godot doesn't need Raytracing filters. Removing them saves space in the weights files. #if 0 +// -- GODOT end -- + // -------------------------------------------------------------------------- // RTFilter // -------------------------------------------------------------------------- @@ -491,7 +505,9 @@ namespace oidn { weightData.hdr_alb = weights::rt_hdr_alb; weightData.hdr_alb_nrm = weights::rt_hdr_alb_nrm; } +// -- GODOT start -- #endif +// -- GODOT end -- // -------------------------------------------------------------------------- // RTLightmapFilter |