diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-07-05 04:04:07 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-07-05 04:04:07 +0400 |
| commit | 5aec61f8493f5876a52ec67871148803396ff223 (patch) | |
| tree | e33abb612af194c5dcf020def29d1410a7488ee8 /intern/cycles/kernel/kernel_path_volume.h | |
| parent | b4b5d9c24ec26a51c72b0b695ba749a2b93e4e62 (diff) | |
Cycles: Compile fixes for CUDA Volumetrics.
* CUDA can be compiled with Volume support again, change line 78 kernel_types.h for that.
Volumes are still fragile on GPU though, got some Memory/Address CUDA errors in tests.. needs to be investigated more deeply.
Diffstat (limited to 'intern/cycles/kernel/kernel_path_volume.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path_volume.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_path_volume.h b/intern/cycles/kernel/kernel_path_volume.h index 6cc3085b96e..8453b79de45 100644 --- a/intern/cycles/kernel/kernel_path_volume.h +++ b/intern/cycles/kernel/kernel_path_volume.h @@ -103,8 +103,6 @@ ccl_device bool kernel_path_volume_bounce(KernelGlobals *kg, RNG *rng, return true; } -#ifdef __KERNEL_CPU__ - ccl_device void kernel_branched_path_volume_connect_light(KernelGlobals *kg, RNG *rng, ShaderData *sd, float3 throughput, PathState *state, PathRadiance *L, float num_samples_adjust, bool sample_all_lights, Ray *ray, const VolumeSegment *segment) @@ -275,7 +273,5 @@ ccl_device void kernel_branched_path_volume_connect_light(KernelGlobals *kg, RNG #endif -#endif - CCL_NAMESPACE_END |