diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-10 00:03:49 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-10 00:03:49 +0400 |
| commit | 743a7a4a4b2b6999b911704b6367962fc365474a (patch) | |
| tree | 8561ee8d11ecdb360b48eb19bc9932171cf71572 /intern/cycles/kernel/kernel_sse3.cpp | |
| parent | be7b4e26b19d705224dc6833892f792659662777 (diff) | |
Cycles:
* GPU kernel can now be compiled without __NON_PROGRESSIVE__ again, was broken after my last commit. Also add a check for have_error(), in case the GPU kernel comes without Non-Progressive, to avoid a crash.
* Don't compile progressive kernel twice on CPU, if __NON_PROGRESSIVE__ would be disabled there.
Diffstat (limited to 'intern/cycles/kernel/kernel_sse3.cpp')
| -rw-r--r-- | intern/cycles/kernel/kernel_sse3.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_sse3.cpp b/intern/cycles/kernel/kernel_sse3.cpp index 35a816f7da9..a25c0bca93a 100644 --- a/intern/cycles/kernel/kernel_sse3.cpp +++ b/intern/cycles/kernel/kernel_sse3.cpp @@ -41,10 +41,12 @@ CCL_NAMESPACE_BEGIN void kernel_cpu_sse3_path_trace(KernelGlobals *kg, float *buffer, unsigned int *rng_state, int sample, int x, int y, int offset, int stride) { - if(kernel_data.integrator.progressive) - kernel_path_trace_progressive(kg, buffer, rng_state, sample, x, y, offset, stride); - else +#ifdef __NON_PROGRESSIVE__ + if(!kernel_data.integrator.progressive) kernel_path_trace_non_progressive(kg, buffer, rng_state, sample, x, y, offset, stride); + else +#endif + kernel_path_trace_progressive(kg, buffer, rng_state, sample, x, y, offset, stride); } /* Tonemapping */ |