diff options
Diffstat (limited to 'intern/cycles/device/device_task.h')
| -rw-r--r-- | intern/cycles/device/device_task.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h index 0f718528b86..972f6131092 100644 --- a/intern/cycles/device/device_task.h +++ b/intern/cycles/device/device_task.h @@ -64,7 +64,7 @@ class DenoiseParams { class DeviceTask : public Task { public: - typedef enum { RENDER, DENOISE, DENOISE_BUFFER, FILM_CONVERT, SHADER } Type; + typedef enum { RENDER, FILM_CONVERT, SHADER, DENOISE_BUFFER } Type; Type type; int x, y, w, h; @@ -90,7 +90,7 @@ class DeviceTask : public Task { void update_progress(RenderTile *rtile, int pixel_samples = -1); - function<bool(Device *device, RenderTile &)> acquire_tile; + function<bool(Device *device, RenderTile &, uint)> acquire_tile; function<void(long, int)> update_progress_sample; function<void(RenderTile &)> update_tile_sample; function<void(RenderTile &)> release_tile; @@ -98,6 +98,7 @@ class DeviceTask : public Task { function<void(RenderTile *, Device *)> map_neighbor_tiles; function<void(RenderTile *, Device *)> unmap_neighbor_tiles; + uint tile_types; DenoiseParams denoising; bool denoising_from_render; vector<int> denoising_frames; |