ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix T41222 Blender gives weird output when baking (4096*4096) resolution on GPU"

Browse source 
This reverts commit a48b372b04.

Leaving only the part that fix device_multi.cpp
This commit is contained in:
Dalai Felinto 2014-08-06 13:10:56 -03:00
parent 3296d98ec1
commit 2c5b6859d9
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
intern/cycles/device/device_cuda.cpp
View file

@ -25,7 +25,6 @@
#include "cuew.h"
#include "util_debug.h"
#include "util_foreach.h"
#include "util_map.h"
#include "util_opengl.h"
#include "util_path.h"
@ -967,10 +966,7 @@ public:
int get_split_task_count(DeviceTask& task)
{
if (task.type == DeviceTask::SHADER)
return task.get_subtask_count(TaskScheduler::num_threads(), 1024 * 1024);
else
return 1;
return 1;
}
void task_add(DeviceTask& task)
@ -983,15 +979,6 @@ public:
cuda_assert(cuCtxSynchronize());
cuda_pop_context();
}
else if(task.type == DeviceTask::SHADER) {
/* split task into smaller ones */
list<DeviceTask> tasks;
task.split(tasks, TaskScheduler::num_threads(), 1024 * 1024);
foreach(DeviceTask& task, tasks)
task_pool.push(new CUDADeviceTask(this, task));
}
else {
task_pool.push(new CUDADeviceTask(this, task));
}