[Bf-blender-cvs] [d927a96] cycles_split_kernel: Cycles: Make split kernel methods in Device private

Mai Lavelle noreply at git.blender.org
Wed Dec 7 10:53:57 CET 2016


Commit: d927a964b20074d8656951f6f195dbbc115bafcd
Author: Mai Lavelle
Date:   Wed Dec 7 04:15:45 2016 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rBd927a964b20074d8656951f6f195dbbc115bafcd

Cycles: Make split kernel methods in Device private

These methods shouldn't really be called from anywhere except
`DeviceSplitKernel`.

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

M	intern/cycles/device/device.h

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

diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index b5e8f25..078ea2d 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -282,6 +282,7 @@ public:
 	        const DeviceRequestedFeatures& /*requested_features*/)
 	{ return true; }
 
+private:
 	/* split kernel */
 	virtual bool enqueue_split_kernel_data_init(const KernelDimensions& /*dim*/,
 	                                            RenderTile& /*rtile*/,
@@ -321,6 +322,9 @@ public:
 		return make_int2(0, 0);
 	}
 
+	friend class DeviceSplitKernel;
+
+public:
 	/* tasks */
 	virtual int get_split_task_count(DeviceTask& task) = 0;
 	virtual void task_add(DeviceTask& task) = 0;




More information about the Bf-blender-cvs mailing list