archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T40379: world MIS causing too much CUDA memory usage.

Browse Source 
The kernel for baking the world texture was the same as the one used for
baking. Now that's separate which allows the kernel to reserve much less
memory.
This commit is contained in:
Brecht Van Lommel
2014-05-27 13:20:07 +02:00
parent bc9e66f083
commit 69c7522b24
10 changed files with 81 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/kernel/kernel.cpp
View File

@@ -122,7 +122,10 @@ void kernel_cpu_convert_to_half_float(KernelGlobals *kg, uchar4 *rgba, float *bu
void kernel_cpu_shader(KernelGlobals *kg, uint4 *input, float4 *output, int type, int i)
{
kernel_shader_evaluate(kg, input, output, (ShaderEvalType)type, i);
if(type >= SHADER_EVAL_BAKE)
kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type, i);
else
kernel_shader_evaluate(kg, input, output, (ShaderEvalType)type, i);
}
CCL_NAMESPACE_END