diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-19 00:05:29 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-19 00:10:46 +0300 |
commit | faeac63f68f188e7a1e0f87748c1c95c9465f3d1 (patch) | |
tree | 2a339bea457b1b3cb7edf01a57f511d5c713ef5c /intern/cycles/kernel/svm/svm_voxel.h | |
parent | 003b56801c1449ecc596c2b904fa75faecb7dfea (diff) |
Cycles: Fix compilation of OpenCL kernel after point density commit
Diffstat (limited to 'intern/cycles/kernel/svm/svm_voxel.h')
-rw-r--r-- | intern/cycles/kernel/svm/svm_voxel.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_voxel.h b/intern/cycles/kernel/svm/svm_voxel.h index 8752307472f..1d9ff9e7007 100644 --- a/intern/cycles/kernel/svm/svm_voxel.h +++ b/intern/cycles/kernel/svm/svm_voxel.h @@ -25,9 +25,10 @@ ccl_device void svm_node_tex_voxel(KernelGlobals *kg, uint4 node, int *offset) { - int id = node.y; uint co_offset, density_out_offset, color_out_offset, space; decode_node_uchar4(node.z, &co_offset, &density_out_offset, &color_out_offset, &space); +#ifdef __VOLUME__ + int id = node.y; float3 co = stack_load_float3(stack, co_offset); if(space == NODE_TEX_VOXEL_SPACE_OBJECT) { co = volume_normalized_position(kg, sd, co); @@ -50,7 +51,8 @@ ccl_device void svm_node_tex_voxel(KernelGlobals *kg, stack_store_float3(stack, color_out_offset, make_float3(0.0f, 0.0f, 0.0f)); return; } -#ifdef __KERNEL_GPU__ +#endif /* __VOLUME__ */ +#if defined(__KERNEL_GPU__) || !defined(__VOLUME__) float4 r = make_float4(0.0f, 0.0f, 0.0f, 0.0f); #else float4 r = kernel_tex_image_interp_3d(id, co.x, co.y, co.z); |