Commit: aff7d5998653d6d7ba682b29187e70998b4ee4e3
Author: Brecht Van Lommel
Date: Thu Jan 21 12:32:03 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rBaff7d5998653d6d7ba682b29187e70998b4ee4e3
Fix T84908: Cycles GPU + CPU and denoising failure after recent fix
===================================================================
M intern/cycles/render/session.cpp
===================================================================
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
