diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-08 16:15:18 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-08 16:15:18 +0400 |
commit | 6a82b985c30f783fcd927d1044b32a1c9253da35 (patch) | |
tree | 4a340abdf848cf447ac3d78aca788c539364c2c6 /intern/cycles | |
parent | 5a9bb39e34ec7938599e6ece30198b359cf47187 (diff) |
Fix #32815: cycles environment render as lamp crash with resolution >= 1024.
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/render/light.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 5c1737bd60a..d77516a1b18 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -68,20 +68,15 @@ static void dump_background_pixels(Device *device, DeviceScene *dscene, int res, main_task.shader_w = width*height; /* disabled splitting for now, there's an issue with multi-GPU mem_copy_from */ -#if 0 list<DeviceTask> split_tasks; main_task.split_max_size(split_tasks, 128*128); foreach(DeviceTask& task, split_tasks) { device->task_add(task); device->task_wait(); + device->mem_copy_from(d_output, task.shader_x, 1, task.shader_w, sizeof(float4)); } -#else - device->task_add(main_task); - device->task_wait(); -#endif - device->mem_copy_from(d_output, 0, 1, d_output.size(), sizeof(float4)); device->mem_free(d_input); device->mem_free(d_output); |