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.
This commit is contained in:
Thomas Dinges
2016-05-06 23:11:41 +02:00
parent 734d1aec3f
commit 4422b3f919
5 changed files with 26 additions and 3 deletions

View File

@@ -16,7 +16,7 @@
CCL_NAMESPACE_BEGIN
#ifndef __NO_BAKING__
#ifdef __BAKING__
ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadiance *L, RNG rng,
int pass_filter, int sample)
@@ -483,7 +483,7 @@ 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__ */
#endif /* __BAKING__ */
ccl_device void kernel_shader_evaluate(KernelGlobals *kg,
ccl_global uint4 *input,