diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-05-27 15:20:07 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-05-27 17:11:32 +0400 |
commit | 69c7522b2463245ef16ebcf2806645c78e83b4df (patch) | |
tree | 96721c9d2bc755d68cf9eeded77255f4c58018f3 /intern/cycles/kernel/kernel_sse2.cpp | |
parent | bc9e66f0830627e807f720dca4b9d5d8d39e732a (diff) |
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.
Diffstat (limited to 'intern/cycles/kernel/kernel_sse2.cpp')
-rw-r--r-- | intern/cycles/kernel/kernel_sse2.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_sse2.cpp b/intern/cycles/kernel/kernel_sse2.cpp index 455cac046a3..3b5faea2994 100644 --- a/intern/cycles/kernel/kernel_sse2.cpp +++ b/intern/cycles/kernel/kernel_sse2.cpp @@ -66,7 +66,10 @@ void kernel_cpu_sse2_convert_to_half_float(KernelGlobals *kg, uchar4 *rgba, floa void kernel_cpu_sse2_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 |