diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-04 17:29:07 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-04 17:29:07 +0400 |
commit | adea12cb01e4c4f18f345dfbbf49e9e622192e4e (patch) | |
tree | b43018344c696e4d59437fabc7f17f5b9d6a8e80 /intern/cycles/device/device_multi.cpp | |
parent | 68563134d4800be4eb46aa6b598fd719cdaf2980 (diff) |
Cycles: merge of changes from tomato branch.
Regular rendering now works tiled, and supports save buffers to save memory
during render and cache render results.
Brick texture node by Thomas.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture
Image texture Blended Box Mapping.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture
http://mango.blender.org/production/blended_box/
Various bug fixes by Sergey and Campbell.
* Fix for reading freed memory in some node setups.
* Fix incorrect memory read when synchronizing mesh motion.
* Fix crash appearing when direct light usage is different on different layers.
* Fix for vector pass gives wrong result in some circumstances.
* Fix for wrong resolution used for rendering Render Layer node.
* Option to cancel rendering when doing initial synchronization.
* No more texture limit when using CPU render.
* Many fixes for new tiled rendering.
Diffstat (limited to 'intern/cycles/device/device_multi.cpp')
-rw-r--r-- | intern/cycles/device/device_multi.cpp | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 83e69b98f5d..546ffe5e4b9 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -23,6 +23,8 @@ #include "device_intern.h" #include "device_network.h" +#include "buffers.h" + #include "util_foreach.h" #include "util_list.h" #include "util_map.h" @@ -255,6 +257,30 @@ public: rgba.device_pointer = tmp; } + void map_tile(Device *sub_device, RenderTile& tile) + { + foreach(SubDevice& sub, devices) { + if(sub.device == sub_device) { + if(tile.buffer) tile.buffer = sub.ptr_map[tile.buffer]; + if(tile.rng_state) tile.rng_state = sub.ptr_map[tile.rng_state]; + if(tile.rgba) tile.rgba = sub.ptr_map[tile.rgba]; + } + } + } + + int device_number(Device *sub_device) + { + int i = 0; + + foreach(SubDevice& sub, devices) { + if(sub.device == sub_device) + return i; + i++; + } + + return -1; + } + void task_add(DeviceTask& task) { list<DeviceTask> tasks; @@ -266,7 +292,6 @@ public: tasks.pop_front(); if(task.buffer) subtask.buffer = sub.ptr_map[task.buffer]; - if(task.rng_state) subtask.rng_state = sub.ptr_map[task.rng_state]; if(task.rgba) subtask.rgba = sub.ptr_map[task.rgba]; if(task.shader_input) subtask.shader_input = sub.ptr_map[task.shader_input]; if(task.shader_output) subtask.shader_output = sub.ptr_map[task.shader_output]; |