diff options
Diffstat (limited to 'intern/cycles/device/device.h')
-rw-r--r-- | intern/cycles/device/device.h | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index b17abac2a1b..2ee2e044618 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -22,10 +22,10 @@ #include <stdlib.h> #include "device_memory.h" +#include "device_task.h" #include "util_list.h" #include "util_string.h" -#include "util_task.h" #include "util_thread.h" #include "util_types.h" #include "util_vector.h" @@ -33,6 +33,7 @@ CCL_NAMESPACE_BEGIN class Progress; +class RenderTile; /* Device Types */ @@ -67,32 +68,6 @@ public: } }; -/* Device Task */ - -class DeviceTask : public Task { -public: - typedef enum { PATH_TRACE, TONEMAP, SHADER } Type; - Type type; - - int x, y, w, h; - device_ptr rng_state; - device_ptr rgba; - device_ptr buffer; - int sample; - int resolution; - int offset, stride; - - device_ptr shader_input; - device_ptr shader_output; - int shader_eval_type; - int shader_x, shader_w; - - DeviceTask(Type type = PATH_TRACE); - - void split(list<DeviceTask>& tasks, int num); - void split_max_size(list<DeviceTask>& tasks, int max_size); -}; - /* Device */ class Device { @@ -150,6 +125,10 @@ public: void server_run(); #endif + /* multi device */ + virtual void map_tile(Device *sub_device, RenderTile& tile) {} + virtual int device_number(Device *sub_device) { return 0; } + /* static */ static Device *create(DeviceInfo& info, bool background = true, int threads = 0); |