[Bf-blender-cvs] [b3299ba] master: Cycles: Pass requested tile size to the device via device task

[Sergey Sharybin]

Commit: b3299bace003d9d061b188760a263ca7b42c36d7
Author: Sergey Sharybin
Date:   Sat May 9 19:09:07 2015 +0500
Branches: master
https://developer.blender.org/rBb3299bace003d9d061b188760a263ca7b42c36d7

Cycles: Pass requested tile size to the device via device task

This is currently unused but crucial for things like calculating amount of
device memory required to deal with the tasks.

Maybe not really best place to store it, but consider it good enough for now.

===================================================================

M	intern/cycles/device/device_task.h
M	intern/cycles/render/session.cpp

===================================================================

diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h
index 0c23d89..834ea60 100644
--- a/intern/cycles/device/device_task.h
+++ b/intern/cycles/device/device_task.h
@@ -65,6 +65,7 @@ public:
 
 	bool need_finish_queue;
 	bool integrator_branched;
+	int2 requested_tile_size;
 protected:
 	double last_update_time;
 };
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 82197d5..9ef1c1f 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -859,6 +859,7 @@ void Session::path_trace()
 	task.update_progress_sample = function_bind(&Session::update_progress_sample, this);
 	task.need_finish_queue = params.progressive_refine;
 	task.integrator_branched = scene->integrator->method == Integrator::BRANCHED_PATH;
+	task.requested_tile_size = params.tile_size;
 
 	device->task_add(task);
 }