diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-06-06 16:40:09 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-06-06 17:39:04 +0400 |
commit | e4e58d46128dc7fe4fb9b881d73b38173f00f5c3 (patch) | |
tree | cc38ac39838bec84d28de396374ba022139a8aa2 /intern/cycles/kernel/kernel_sse41.cpp | |
parent | 553264ff8e20484d0b91bb468f56aa1b7144f7aa (diff) |
Fix T40370: cycles CUDA baking timeout with high number of AA samples.
Now baking does one AA sample at a time, just like final render. There is
also some code for shader antialiasing that solves T40369 but it is disabled
for now because there may be unpredictable side effects.
Diffstat (limited to 'intern/cycles/kernel/kernel_sse41.cpp')
-rw-r--r-- | intern/cycles/kernel/kernel_sse41.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_sse41.cpp b/intern/cycles/kernel/kernel_sse41.cpp index a3731d790f4..4b48d10b020 100644 --- a/intern/cycles/kernel/kernel_sse41.cpp +++ b/intern/cycles/kernel/kernel_sse41.cpp @@ -67,12 +67,12 @@ void kernel_cpu_sse41_convert_to_half_float(KernelGlobals *kg, uchar4 *rgba, flo /* Shader Evaluate */ -void kernel_cpu_sse41_shader(KernelGlobals *kg, uint4 *input, float4 *output, int type, int i) +void kernel_cpu_sse41_shader(KernelGlobals *kg, uint4 *input, float4 *output, int type, int i, int sample) { if(type >= SHADER_EVAL_BAKE) - kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type, i); + kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type, i, sample); else - kernel_shader_evaluate(kg, input, output, (ShaderEvalType)type, i); + kernel_shader_evaluate(kg, input, output, (ShaderEvalType)type, i, sample); } CCL_NAMESPACE_END |