diff options
author | Patrick Mours <pmours@nvidia.com> | 2021-01-20 16:40:46 +0300 |
---|---|---|
committer | Patrick Mours <pmours@nvidia.com> | 2021-01-20 16:40:46 +0300 |
commit | fc5f9a8ac900bcc0c712f89d4efca3583b0906ab (patch) | |
tree | c72bab181a6bd6ee1239e809df7089471e94b554 /intern | |
parent | 6a8f4bfc60800f63ab2571fc534ffff253e953bd (diff) | |
parent | 4a09907eab2a3b6da53b1942aebefdcf58bbd604 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/render/session.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 0debc08d911..f3cdae77d47 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -540,6 +540,10 @@ bool Session::acquire_tile(RenderTile &rtile, Device *tile_device, uint tile_typ tile->buffers = new RenderBuffers(tile_device); 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); + } tile->buffers->map_neighbor_copied = false; |