Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-03 00:56:07 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-03 01:46:19 +0300
commit6699454fb642bfd07e85f8d7bd8f8879878e3fc5 (patch)
tree65d7c75edde60ba8d5e9b24256961f4390c6c19c /intern/cycles/device/device_memory.cpp
parente84966ac42cac6b1bef957cbe79c450f9858a063 (diff)
Cycles: make CUDA code a bit more robust to host/device alloc failures.
Fixes a few corner cases found while stress testing host mapped memory.
Diffstat (limited to 'intern/cycles/device/device_memory.cpp')
-rw-r--r--intern/cycles/device/device_memory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_memory.cpp b/intern/cycles/device/device_memory.cpp
index 3ad0946330b..b5db76bb3df 100644
--- a/intern/cycles/device/device_memory.cpp
+++ b/intern/cycles/device/device_memory.cpp
@@ -86,7 +86,7 @@ void device_memory::device_free()
void device_memory::device_copy_to()
{
- if(data_size) {
+ if(host_pointer) {
device->mem_copy_to(*this);
}
}