From ad79bea8e4a4df7e9a5abb5bc665bd39137b9b30 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 28 Jun 2012 11:16:47 +0000 Subject: [PATCH] Forgot these files in previous commit. --- intern/cycles/device/device_task.cpp | 92 ++++++++++++++++++++++++++++ intern/cycles/device/device_task.h | 67 ++++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 intern/cycles/device/device_task.cpp create mode 100644 intern/cycles/device/device_task.h diff --git a/intern/cycles/device/device_task.cpp b/intern/cycles/device/device_task.cpp new file mode 100644 index 00000000000..fe872bc6f19 --- /dev/null +++ b/intern/cycles/device/device_task.cpp @@ -0,0 +1,92 @@ +/* + * Copyright 2011, Blender Foundation. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include +#include + +#include "device_task.h" + +#include "util_algorithm.h" + +CCL_NAMESPACE_BEGIN + +/* Device Task */ + +DeviceTask::DeviceTask(Type type_) +: type(type_), x(0), y(0), w(0), h(0), rgba(0), buffer(0), + sample(0), num_samples(1), resolution(0), + shader_input(0), shader_output(0), + shader_eval_type(0), shader_x(0), shader_w(0) +{ +} + +void DeviceTask::split_max_size(list& tasks, int max_size) +{ + int num; + + if(type == SHADER) { + num = (shader_w + max_size - 1)/max_size; + } + else { + max_size = max(1, max_size/w); + num = (h + max_size - 1)/max_size; + } + + split(tasks, num); +} + +void DeviceTask::split(list& tasks, int num) +{ + if(type == SHADER) { + num = min(shader_w, num); + + for(int i = 0; i < num; i++) { + int tx = shader_x + (shader_w/num)*i; + int tw = (i == num-1)? shader_w - i*(shader_w/num): shader_w/num; + + DeviceTask task = *this; + + task.shader_x = tx; + task.shader_w = tw; + + tasks.push_back(task); + } + } + else if(type == PATH_TRACE) { + for(int i = 0; i < num; i++) + tasks.push_back(*this); + } + else { + num = min(h, num); + + for(int i = 0; i < num; i++) { + int ty = y + (h/num)*i; + int th = (i == num-1)? h - i*(h/num): h/num; + + DeviceTask task = *this; + + task.y = ty; + task.h = th; + + tasks.push_back(task); + } + } +} + +CCL_NAMESPACE_END + diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h new file mode 100644 index 00000000000..e0433e56c64 --- /dev/null +++ b/intern/cycles/device/device_task.h @@ -0,0 +1,67 @@ +/* + * Copyright 2011, Blender Foundation. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __DEVICE_TASK_H__ +#define __DEVICE_TASK_H__ + +#include "device_memory.h" + +#include "util_function.h" +#include "util_list.h" +#include "util_task.h" + +CCL_NAMESPACE_BEGIN + +/* Device Task */ + +class Device; +class RenderBuffers; +class RenderTile; +class Tile; + +class DeviceTask : public Task { +public: + typedef enum { PATH_TRACE, TONEMAP, SHADER } Type; + Type type; + + int x, y, w, h; + device_ptr rgba; + device_ptr buffer; + int sample; + int num_samples; + 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& tasks, int num); + void split_max_size(list& tasks, int max_size); + + boost::function acquire_tile; + boost::function release_tile; +}; + +CCL_NAMESPACE_END + +#endif /* __DEVICE_TASK_H__ */ +