[Bf-blender-cvs] [6f626bd60f] cycles_split_kernel: Cycles: Fix rendering with CPU split kernel after work stealing changes
Mai Lavelle
noreply at git.blender.org
Thu Feb 9 04:11:36 CET 2017
Commit: 6f626bd60f58084dfc4b917722c4f6e99f5e7d79
Author: Mai Lavelle
Date: Fri Feb 3 23:43:53 2017 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rB6f626bd60f58084dfc4b917722c4f6e99f5e7d79
Cycles: Fix rendering with CPU split kernel after work stealing changes
Not sure whats going on but debugging is taking too long so just using a
quick fix for now.
===================================================================
M intern/cycles/device/device_cpu.cpp
===================================================================
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index c131bea521..69a5169613 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -833,6 +833,12 @@ protected:
mem_free(mem);
}
+ virtual int2 split_kernel_global_size(DeviceTask *task, DeviceSplitKernel& /*split_kernel*/)
+ {
+ /* TODO(mai): this needs investigation but cpu gives incorrect render if global size doesnt match tile size */
+ return task->requested_tile_size;
+ }
+
virtual int2 split_kernel_local_size()
{
return make_int2(1, 1);
More information about the Bf-blender-cvs
mailing list