diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-17 03:20:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-17 03:38:55 +0300 |
| commit | 0ccae52394771fed6d50b7a0142a0f1d259da1d5 (patch) | |
| tree | d14ef4482482713d68c3f212ce218fed4ab17274 /intern/cycles/kernel/svm/svm_voxel.h | |
| parent | 833eb863ebe795b9b2589db8862b08202668c5a6 (diff) | |
Fix OpenCL kernel build errors after recent 3D texture changes.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_voxel.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_voxel.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm_voxel.h b/intern/cycles/kernel/svm/svm_voxel.h index af03ce3fe12..a086d321399 100644 --- a/intern/cycles/kernel/svm/svm_voxel.h +++ b/intern/cycles/kernel/svm/svm_voxel.h @@ -27,6 +27,7 @@ ccl_device void svm_node_tex_voxel(KernelGlobals *kg, { 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) { @@ -41,10 +42,13 @@ ccl_device void svm_node_tex_voxel(KernelGlobals *kg, tfm.w = read_node_float(kg, offset); co = transform_point(&tfm, co); } -#if defined(__KERNEL_GPU__) +# if defined(__KERNEL_GPU__) float4 r = volume_image_texture_3d(id, co.x, co.y, co.z); -#else +# else float4 r = kernel_tex_image_interp_3d(id, co.x, co.y, co.z); +# endif +#else + float4 r = make_float4(0.0f, 0.0f, 0.0f, 0.0f); #endif if (stack_valid(density_out_offset)) stack_store_float(stack, density_out_offset, r.w); |