diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-01-21 14:32:03 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-01-21 15:20:05 +0300 |
commit | aff7d5998653d6d7ba682b29187e70998b4ee4e3 (patch) | |
tree | c8d0cceb8164d3a8b118105b6fe75b76bba53fe0 /intern/cycles | |
parent | 9237b2019cc385aa6edabb2ae1cd7647d103bcba (diff) |
Fix T84908: Cycles GPU + CPU and denoising failure after recent fix
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/render/session.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index f3cdae77d47..d0ab3445549 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -541,8 +541,12 @@ bool Session::acquire_tile(RenderTile &rtile, Device *tile_device, uint tile_typ tile->buffers->reset(buffer_params); } else if (tile->buffers->buffer.device != tile_device) { - /* Move buffer to current tile device again in case it was stolen before. */ - tile->buffers->buffer.move_device(tile_device); + /* Move buffer to current tile device again in case it was stolen before. + * Not needed for denoising since that already handles mapping of tiles and + * neighbors to its own device. */ + if (rtile.task != RenderTile::DENOISE) { + tile->buffers->buffer.move_device(tile_device); + } } tile->buffers->map_neighbor_copied = false; |