[Bf-blender-cvs] [bc652766e8] master: Cycles: Expose passes size to device tasks

Mai Lavelle noreply at git.blender.org
Wed Mar 8 07:53:11 CET 2017


Commit: bc652766e8a4941110d9102b14889fdd09154db9
Author: Mai Lavelle
Date:   Fri Jan 20 03:05:32 2017 -0500
Branches: master
https://developer.blender.org/rBbc652766e8a4941110d9102b14889fdd09154db9

Cycles: Expose passes size to device tasks

This is needed so devices can know the size of a tile buffer before any
tiles are acquired.

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

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 8bd54c3d2b..f31092fd9d 100644
--- a/intern/cycles/device/device_task.h
+++ b/intern/cycles/device/device_task.h
@@ -51,6 +51,8 @@ public:
 	int shader_filter;
 	int shader_x, shader_w;
 
+	int passes_size;
+
 	explicit DeviceTask(Type type = PATH_TRACE);
 
 	int get_subtask_count(int num, int max_size = 0);
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 420866c943..5574475312 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -887,6 +887,7 @@ void Session::path_trace()
 	task.need_finish_queue = params.progressive_refine;
 	task.integrator_branched = scene->integrator->method == Integrator::BRANCHED_PATH;
 	task.requested_tile_size = params.tile_size;
+	task.passes_size = tile_manager.params.get_passes_size();
 
 	device->task_add(task);
 }




More information about the Bf-blender-cvs mailing list