ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix T84049: Crash when using Cycles Progressive Refine with OptiX+CPU

Browse source 
Tile stealing may steal a CPU tile buffer and move it to the GPU, but next time around that
tile may be re-used on the CPU again (in progressive refinement mode). The buffer would
still be on the GPU then though, so is inaccessible to the CPU. As a result Blender crashed
when the CPU tried to write results to that tile buffer.
This fixes that by ensuring a stolen tile buffer is moved back to the device it is used on before
rendering.
This commit is contained in:
Patrick Mours 2021-01-20 14:12:43 +01:00
parent 87db3423c9
commit 4a09907eab
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
intern/cycles/render/session.cpp
View file

@ -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;