From 69c7522b2463245ef16ebcf2806645c78e83b4df Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 27 May 2014 13:20:07 +0200 Subject: Fix T40379: world MIS causing too much CUDA memory usage. 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. --- intern/cycles/kernel/kernel_sse41.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'intern/cycles/kernel/kernel_sse41.cpp') diff --git a/intern/cycles/kernel/kernel_sse41.cpp b/intern/cycles/kernel/kernel_sse41.cpp index 0ece67e6d2b..a3731d790f4 100644 --- a/intern/cycles/kernel/kernel_sse41.cpp +++ b/intern/cycles/kernel/kernel_sse41.cpp @@ -69,7 +69,10 @@ void kernel_cpu_sse41_convert_to_half_float(KernelGlobals *kg, uchar4 *rgba, flo void kernel_cpu_sse41_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 -- cgit v1.2.3