diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-07 00:11:41 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-07 00:13:33 +0300 |
| commit | 4422b3f9199cdd13c162ebc16c9e1d1b18f76bae (patch) | |
| tree | e1126c08d85fc4ce51be98b132ce5832f2e227cd /intern/cycles/kernel/kernels | |
| parent | 734d1aec3f93b8757533284330afc2ac651442bd (diff) | |
Some fixes for CUDA runtime compile:
* When Baking wasn't used we got an error.
* On top of Volume Nodes (NODES_FEATURE_VOLUME), we now also check if we need volume sampling code,
so we can disable that as well and save some further compilation time.
Diffstat (limited to 'intern/cycles/kernel/kernels')
| -rw-r--r-- | intern/cycles/kernel/kernels/cuda/kernel.cu | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernels/cuda/kernel.cu b/intern/cycles/kernel/kernels/cuda/kernel.cu index 259b634f939..37fae54faf0 100644 --- a/intern/cycles/kernel/kernels/cuda/kernel.cu +++ b/intern/cycles/kernel/kernels/cuda/kernel.cu @@ -193,6 +193,7 @@ kernel_cuda_shader(uint4 *input, } } +#ifdef __BAKING__ extern "C" __global__ void CUDA_LAUNCH_BOUNDS(CUDA_THREADS_BLOCK_WIDTH, CUDA_KERNEL_MAX_REGISTERS) kernel_cuda_bake(uint4 *input, float4 *output, int type, int filter, int sx, int sw, int offset, int sample) @@ -202,6 +203,7 @@ kernel_cuda_bake(uint4 *input, float4 *output, int type, int filter, int sx, int if(x < sx + sw) kernel_bake_evaluate(NULL, input, output, (ShaderEvalType)type, filter, x, offset, sample); } +#endif #endif |