diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-05 16:11:16 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-05 16:11:16 +0300 |
| commit | c53c8df6d9e3d2093baf9aa69e350b9cba530e48 (patch) | |
| tree | efeee5470fff293e3ef82a0bfb7d56c4fe01953c | |
| parent | 24ae7b9035ad78c3d030210a497bf20af6b45318 (diff) | |
Cycles: ifdef some extra code when building split kernels
| -rw-r--r-- | intern/cycles/kernel/kernel_bake.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel.cl | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h index 4e4b63a2e1d..96e85474647 100644 --- a/intern/cycles/kernel/kernel_bake.h +++ b/intern/cycles/kernel/kernel_bake.h @@ -18,6 +18,8 @@ CCL_NAMESPACE_BEGIN #undef USE_BAKE_JITTER +#ifndef __NO_BAKING__ + ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadiance *L, RNG rng, const bool is_ao, const bool is_sss, int sample) { @@ -525,6 +527,8 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input, output[i] += make_float4(out.x, out.y, out.z, 1.0f) * output_fac; } +#endif /* __NO_BAKING__ */ + ccl_device void kernel_shader_evaluate(KernelGlobals *kg, ccl_global uint4 *input, ccl_global float4 *output, diff --git a/intern/cycles/kernel/kernels/opencl/kernel.cl b/intern/cycles/kernel/kernels/opencl/kernel.cl index 0a44a4d0301..77cb3125d46 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel.cl @@ -22,8 +22,24 @@ #include "../../kernel_globals.h" #include "../../kernel_film.h" + +#ifdef __COMPILE_ONLY_MEGAKERNEL__ #include "../../kernel_path.h" #include "../../kernel_path_branched.h" +#else /* __COMPILE_ONLY_MEGAKERNEL__ */ +/* Include only actually used headers for the case + * when path tracing kernels are not needed. + */ +#include "../../kernel_differential.h" +#include "../../kernel_montecarlo.h" +#include "../../kernel_projection.h" +#include "../../geom/geom.h" + +#include "../../kernel_accumulate.h" +#include "../../kernel_camera.h" +#include "../../kernel_shader.h" +#endif /* __COMPILE_ONLY_MEGAKERNEL__ */ + #include "../../kernel_bake.h" #ifdef __COMPILE_ONLY_MEGAKERNEL__ @@ -55,7 +71,7 @@ __kernel void kernel_ocl_path_trace( kernel_path_trace(kg, buffer, rng_state, sample, x, y, offset, stride); } -#else // __COMPILE_ONLY_MEGAKERNEL__ +#else /* __COMPILE_ONLY_MEGAKERNEL__ */ __kernel void kernel_ocl_shader( ccl_constant KernelData *data, @@ -174,4 +190,4 @@ __kernel void kernel_ocl_convert_to_half_float( kernel_film_convert_to_half_float(kg, rgba, buffer, sample_scale, x, y, offset, stride); } -#endif // __COMPILE_ONLY_MEGAKERNEL__ +#endif /* __COMPILE_ONLY_MEGAKERNEL__ */ |