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_bake.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'intern/cycles/kernel/kernel_bake.h') diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h index 6e735517763..c3ae2b6a54e 100644 --- a/intern/cycles/kernel/kernel_bake.h +++ b/intern/cycles/kernel/kernel_bake.h @@ -356,11 +356,6 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input, ccl_device void kernel_shader_evaluate(KernelGlobals *kg, ccl_global uint4 *input, ccl_global float4 *output, ShaderEvalType type, int i) { - if(type >= SHADER_EVAL_BAKE) { - kernel_bake_evaluate(kg, input, output, type, i); - return; - } - ShaderData sd; uint4 in = input[i]; float3 out; -- cgit v1.2.3