diff options
author | Martijn Berger <martijn.berger@gmail.com> | 2013-12-07 05:29:53 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-07 15:26:58 +0400 |
commit | 85a0c5d4e1030a5fa95ad7450958a1b0fa033381 (patch) | |
tree | 8e43b6167b7e4df8fad2a4f0f39c82fe5b3c2807 /intern/cycles/device/device_cpu.cpp | |
parent | 5c07f62fabc9b6a20c85ec5ea5e15a99353bd091 (diff) |
Cycles: network render code updated for latest changes and improved
This actually works somewhat now, although viewport rendering is broken and any
kind of network error or connection failure will kill Blender.
* Experimental WITH_CYCLES_NETWORK cmake option
* Networked Device is shown as an option next to CPU and GPU Compute
* Various updates to work with the latest Cycles code
* Locks and thread safety for RPC calls and tiles
* Refactored pointer mapping code
* Fix error in CPU brand string retrieval code
This includes work by Doug Gale, Martijn Berger and Brecht Van Lommel.
Reviewers: brecht
Differential Revision: http://developer.blender.org/D36
Diffstat (limited to 'intern/cycles/device/device_cpu.cpp')
-rw-r--r-- | intern/cycles/device/device_cpu.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 85a7b9c186d..e084116c72d 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -45,11 +45,13 @@ class CPUDevice : public Device public: TaskPool task_pool; KernelGlobals kernel_globals; + #ifdef WITH_OSL OSLGlobals osl_globals; #endif - CPUDevice(Stats &stats) : Device(stats) + CPUDevice(DeviceInfo& info, Stats &stats, bool background) + : Device(info, stats, background) { #ifdef WITH_OSL kernel_globals.osl = &osl_globals; @@ -401,9 +403,9 @@ public: } }; -Device *device_cpu_create(DeviceInfo& info, Stats &stats) +Device *device_cpu_create(DeviceInfo& info, Stats &stats, bool background) { - return new CPUDevice(stats); + return new CPUDevice(info, stats, background); } void device_cpu_info(vector<DeviceInfo>& devices) |