Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-05-09 17:09:07 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-05-09 17:09:07 +0300
commitb3299bace003d9d061b188760a263ca7b42c36d7 (patch)
treeee0208552fb39ce6d02e28db5e2c6ad0fd778f42
parent0e4ddaadd487ebdd80399e2fd24cb8b12bd7f721 (diff)
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.
-rw-r--r--intern/cycles/device/device_task.h1
-rw-r--r--intern/cycles/render/session.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h
index 0c23d8971e0..834ea60988a 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 82197d5340a..9ef1c1f4f1f 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);
}