diff options
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/buffers.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/render/session.cpp | 5 | ||||
-rw-r--r-- | intern/cycles/render/session.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index 6f8740b8a51..3b61ccd176d 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -101,7 +101,7 @@ RenderTile::RenderTile() RenderBuffers::RenderBuffers(Device *device_) { - device = device_; + device = device_; } RenderBuffers::~RenderBuffers() diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 5dabd058cb9..7303cb52ad8 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -42,13 +42,14 @@ Session::Session(const SessionParams& params_) : params(params_), tile_manager(params.progressive, params.samples, params.tile_size, params.start_resolution, params.background == false || params.progressive_refine, params.background, - max(params.device.multi_devices.size(), 1)) + max(params.device.multi_devices.size(), 1)), + stats() { device_use_gl = ((params.device.type != DEVICE_CPU) && !params.background); TaskScheduler::init(params.threads); - device = Device::create(params.device, params.background, params.threads); + device = Device::create(params.device, stats, params.background, params.threads); if(params.background) { buffers = NULL; diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index 8941c6ac459..7bb0cd1ae01 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -24,6 +24,7 @@ #include "tile.h" #include "util_progress.h" +#include "util_stats.h" #include "util_thread.h" #include "util_vector.h" @@ -112,6 +113,7 @@ public: Progress progress; SessionParams params; TileManager tile_manager; + Stats stats; boost::function<void(RenderTile&)> write_render_tile_cb; boost::function<void(RenderTile&)> update_render_tile_cb; |