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.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.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 5ac21e44f75..69b98060c62 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -447,11 +447,11 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, Shade svm_node_blackbody(kg, sd, stack, node.y, node.z); break; # endif /* __EXTRA_NODES__ */ -# if NODES_FEATURE(NODE_FEATURE_VOLUME) +# if NODES_FEATURE(NODE_FEATURE_VOLUME) && !defined(__KERNEL_GPU__) case NODE_TEX_VOXEL: svm_node_tex_voxel(kg, sd, stack, node, &offset); break; -# endif /* NODES_FEATURE(NODE_FEATURE_VOLUME) */ +# endif /* NODES_FEATURE(NODE_FEATURE_VOLUME) && !defined(__KERNEL_GPU__) */ #endif /* NODES_GROUP(NODE_GROUP_LEVEL_3) */ case NODE_END: return; |