diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-21 11:17:08 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-21 11:18:04 +0300 |
| commit | 7ae44e8a3009f46ba264ed8a8de494101e147087 (patch) | |
| tree | d3d6d70769aa209c8658a04c7073e3061b905511 /intern/cycles/kernel/svm/svm_voxel.h | |
| parent | 23831b2161f807a35002fc0cab46eb4c8bbceac8 (diff) | |
Cycles: Workaround for sm_50 on 32bit platform
Basically this commit totally disables new SVN Voxel node, which solves some
of the compiler's issues.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_voxel.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_voxel.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/intern/cycles/kernel/svm/svm_voxel.h b/intern/cycles/kernel/svm/svm_voxel.h index 1d9ff9e7007..bbb687dfce5 100644 --- a/intern/cycles/kernel/svm/svm_voxel.h +++ b/intern/cycles/kernel/svm/svm_voxel.h @@ -16,6 +16,8 @@ CCL_NAMESPACE_BEGIN +#if !defined(__KERNEL_GPU__) + /* TODO(sergey): Think of making it more generic volume-type attribute * sampler. */ @@ -27,7 +29,6 @@ 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) { @@ -51,16 +52,13 @@ 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; } -#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); -#endif if (stack_valid(density_out_offset)) stack_store_float(stack, density_out_offset, r.w); if (stack_valid(color_out_offset)) stack_store_float3(stack, color_out_offset, make_float3(r.x, r.y, r.z)); } +#endif /* !defined(__KERNEL_GPU__) */ + CCL_NAMESPACE_END |